Merge branch 'rebranding' into next

Conflicts:
	linden/indra/newview/viewer_manifest.py

1 files changed, 91 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a34e964..58f753a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -25,6 +25,97 @@
 
         * Updated to SL source 1.21.6.
 
+2008-10-17  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden\indra\newview\skins\default\xui\en-us\menu_viewer.xml:
+        Rebranded the Help menu to point to Imprudence sites, removed issue tracker.
+        * linden\indra\newview\skins\default\xui\en-us\alerts.xml:
+        Ditto.
+        * linden\indra\newview\llappviewer.cpp:
+        Fixed windows compile bug.
+
+2008-10-14  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/installers/windows/installer_template.nsi:
+        Rebranded Windows-specific installer/support files.
+        Replaced instances of "Second Life" with "Imprudence", etc.
+        * linden/indra/newview/installers/windows/lang_de.nsi:
+        Ditto.
+        * linden/indra/newview/installers/windows/lang_en-us.nsi:
+        Ditto.
+        * linden/indra/newview/installers/windows/lang_ja.nsi:
+        Ditto.
+        * linden/indra/newview/installers/windows/lang_ko.nsi:
+        Ditto.
+        * linden/indra/newview/res/viewerRes.rc:
+        Ditto.
+        * linden/indra/copy_win_scripts/start-client.py: 
+        Ditto.
+        * linden/indra/win_updater/updater.cpp: 
+        Ditto.
+        
+
+        * linden/indra/mac_updater/mac_updater.cpp: 
+        Rebranded Mac-specific installer/support files.
+        Replaced instances of "Second Life" with "Imprudence", etc.
+        * linden/indra/newview/English.lproj/InfoPlist.strings: 
+        Ditto.
+        * linden/indra/newview/Info-SecondLife.plist: 
+        Ditto.
+        * linden/indra/newview/SecondLife.nib/objects.xib: 
+        Ditto.
+
+
+        * linden/indra/cmake/UnixInstall.cmake: 
+        Rebranded Linux-specific installer/support files.
+        Replaced instances of "Second Life" with "Imprudence", etc.
+        * linden/indra/linux_crash_logger/llcrashloggerlinux.cpp: 
+        Ditto.
+        * linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh: 
+        Ditto.
+        * linden/indra/newview/linux_tools/wrapper.sh: 
+        Ditto.
+
+
+        * linden/indra/CMakeLists.txt: 
+        Rebranded platform-independent/shared installer/support files.
+        Replaced instances of "Second Life" with "Imprudence", etc.
+        * linden/indra/cmake/00-Common.cmake: 
+        Ditto.
+        * linden/indra/develop.py: 
+        Ditto.
+        * linden/indra/llcrashlogger/llcrashlogger.cpp: 
+        Ditto.
+        * linden/indra/newview/CMakeLists.txt: 
+        Ditto.
+        * linden/indra/newview/ViewerInstall.cmake: 
+        Ditto.
+        * linden/indra/newview/llappviewer.cpp: 
+        Ditto.
+        * linden/indra/newview/viewer_manifest.py: 
+        Ditto.
+
+
+2008-10-01  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llcommon/llversionviewer.h: 
+        Added Imprudence-specific version numbers.
+        * linden/indra/newview/llappviewer.cpp: 
+        Ditto.
+        * linden/indra/newview/llpanellogin.cpp: 
+        Ditto.
+        * linden/indra/newview/llfloaterabout.cpp: 
+        Ditto.
+        
+
+        * linden/indra/llcommon/llversionviewer.h: 
+        Changed viewer and channel name to "Imprudence".
+        * linden/indra/newview/llappviewer.cpp: 
+        Ditto.
+        * linden/indra/cmake/Variables.cmake: 
+        Ditto.
+        * linden/indra/newview/app_settings/settings.xml: 
+        Ditto.
 
 2008-09-28  Jacek Antonelli  <jacek.antonelli@gmail.com>