Actually hide the export box on SL. Must have been asleep when I coded that.
Branding update: Singularity -> Replex
Merge branch 'master' of github.com:lkalif/SingularityViewer
Added Replex icon
Merge branch 'master' of github.com:lkalif/SingularityViewer
Branding: generate wrapper script with cmake
Merge branch 'master' of github.com:lkalif/SingularityViewer
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Conflicts:
	indra/newview/skins/default/xui/es/menu_viewer.xml
	indra/newview/skins/default/xui/es/notifications.xml
Merge branch 'master' of https://github.com/MelanieT/SingularityViewer
Use separate dir for replex crash reports
Use @style@ cmake escapes for the linux wrapper script

This avoids cmake messing up shell variables
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
Merge branch 'master' of github.com:lkalif/SingularityViewer
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Resolved with checkout --theirs

Conflicts:
	indra/newview/skins/default/xui/de/menu_viewer.xml
	indra/newview/skins/default/xui/de/notifications.xml
	indra/newview/skins/default/xui/de/panel_preferences_ascent_system.xml
	indra/newview/skins/default/xui/de/panel_preferences_ascent_vanity.xml
	indra/newview/skins/default/xui/en-us/notifications.xml
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
	indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
	indra/newview/skins/default/xui/es/notifications.xml
	indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
	indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
	indra/newview/skins/default/xui/es/panel_preferences_web.xml
	indra/newview/skins/default/xui/fr/notifications.xml
	indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
	indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
	indra/newview/skins/default/xui/fr/panel_preferences_web.xml
	indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
Appease some nVidia cards/driversets regarding skinned shaders.
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Conflicts:
	indra/newview/skins/default/xui/de/floater_directory2.xml
	indra/newview/skins/default/xui/de/floater_directory3.xml
	indra/newview/skins/default/xui/en-us/floater_directory2.xml
	indra/newview/skins/default/xui/en-us/floater_directory3.xml
	indra/newview/skins/default/xui/en-us/strings.xml
	indra/newview/skins/default/xui/es/floater_directory3.xml
	indra/newview/skins/default/xui/pt/notifications.xml
Windows 64: Added an option to use a prebuilt plugin

In order to use this option, pass -DUSE_PREBUILT_PLUGIN:BOOL=ON
to configure line. This will skip compilation of 64 bit plugin
in the source tree and download prebuilt SLPlugin.exe and its
modules. This allows 64 bit viewer to use 32 bit prebuilt plugin
from the 32 bit viewer build making it possible to use parcel
media. Quicktime, 32 bit Flash are function in this way.
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer