From 8f92d7925f2ba9259a6597c80584b09e023902da Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Sun, 20 Mar 2011 01:37:07 +0100 Subject: fix: voice always on, even if told not to be introduced by 56bf45f >_> --- linden/indra/newview/llvoiceclient.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp index c05f685..2266aab 100644 --- a/linden/indra/newview/llvoiceclient.cpp +++ b/linden/indra/newview/llvoiceclient.cpp @@ -1539,7 +1539,9 @@ void LLVoiceClient::stateMachine() { // Disable voice as long as the viewer is disconnected from the sim (login/relog) - setVoiceEnabled(!gDisconnected); + setVoiceEnabled(!gDisconnected + && gSavedSettings.getBOOL("EnableVoiceChat") + && !gSavedSettings.getBOOL("CmdLineDisableVoice") ); if(mVoiceEnabled) { -- cgit v1.1 From 881a3666a97233f123df79580f8e04d5c1bd8442 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 19 Mar 2011 17:48:29 -0700 Subject: Added log info for when GStreamer fails to load because the plugin wasn't compiled correctly --- .../media_plugins/gstreamer010/media_plugin_gstreamer010.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp index 4316b5d..4f3e283 100755 --- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp +++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp @@ -1409,6 +1409,16 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string) // We're building without GStreamer enabled. Just refuse to initialize. int init_media_plugin(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data) { + // init log file so we know what happened + LLFILE* fp = LLFile::fopen("media_plugin_gstreamer010.log", "w"); + if (fp) + { + time_t timeptr = time(NULL); + fprintf(fp, "%s", asctime(localtime(&timeptr))); + fprintf(fp, "media_plugin_gstreamer010 installed but not built with GStreamer support! It must be recompiled to work!\n"); + fclose(fp); + } + return -1; } -- cgit v1.1 From cfeeb85294da33f94a419b408d985103cd1fb4c2 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 20 Mar 2011 13:11:38 -0700 Subject: Changed version to Experimental 2011.03.20 --- linden/indra/newview/app_settings/viewerversion.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml index bb1b996..626ac07 100644 --- a/linden/indra/newview/app_settings/viewerversion.xml +++ b/linden/indra/newview/app_settings/viewerversion.xml @@ -20,6 +20,6 @@ need to be changed manually - MC - + -- cgit v1.1 From 099604282ea73c5d59f540e022eee780394e7633 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 20 Mar 2011 13:48:58 -0700 Subject: Added Windows Imprudence install scripts to the repo and modified the artwork package --- .gitignore | 1 - linden/indra/newview/installers/windows/README.txt | 40 ++++ .../windows/imprudence_installer_script.iss | 193 +++++++++++++++ .../imprudence_installer_script_experimental.iss | 263 +++++++++++++++++++++ linden/install.xml | 4 +- 5 files changed, 498 insertions(+), 3 deletions(-) create mode 100644 linden/indra/newview/installers/windows/README.txt create mode 100644 linden/indra/newview/installers/windows/imprudence_installer_script.iss create mode 100644 linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss diff --git a/.gitignore b/.gitignore index b06fc1d..aaa6740 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ linden/indra/newview/app_settings/*.db2 linden/indra/newview/app_settings/windlight/ linden/indra/newview/cursors_mac/ linden/indra/newview/viewer.icns -linden/indra/newview/installers/windows/README.txt linden/indra/newview/installers/windows/* # LIBRARIES diff --git a/linden/indra/newview/installers/windows/README.txt b/linden/indra/newview/installers/windows/README.txt new file mode 100644 index 0000000..c29e858 --- /dev/null +++ b/linden/indra/newview/installers/windows/README.txt @@ -0,0 +1,40 @@ + + ABOUT IMPRUDENCE + + Imprudence is an open source metaverse viewer project based on + the Second Life Viewer source. + + The goal of Imprudence is to greatly improve the usability of + the Viewer through community involvement, thoughtful design, + modern development methods, and a pro-change atmosphere. + + For more information about the rationale, goals, and methods + of the Imprudence project, please see MANIFESTO.txt. + + If you would like to get involved with the Imprudence project, + please see CONTRIBUTE.txt. There are many ways you can help, + no matter your skills or the amount of time you can dedicate. + + + Imprudence is online at kokuaviewer.org + + + The latest source code for the Imprudence Viewer is always + available at: + + http://github.com/imprudence/imprudence + + + LICENSE + + All code is licensed under the terms of the GNU General Public + License version 2.0 (plus a special exception). + + See linden/LICENSE-source.txt for details. + + + DISCLAIMERS AND NOTICES + + Second Life is a registered trademark of Linden Research, Inc. + + Imprudence is in no way affiliated with Linden Research, Inc. diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script.iss b/linden/indra/newview/installers/windows/imprudence_installer_script.iss new file mode 100644 index 0000000..17428eb --- /dev/null +++ b/linden/indra/newview/installers/windows/imprudence_installer_script.iss @@ -0,0 +1,193 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) + +; These will change +AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8} +AppName=Imprudence +AppVerName=Imprudence Viewer 1.3.0 RC2 (SSE2 optimized) +DefaultDirName={pf}\Imprudence +DefaultGroupName=Imprudence Viewer +VersionInfoProductName=Imprudence Viewer +OutputBaseFilename=Imprudence-1.3.0-RC2-(SSE2-optimized)-Setup +VersionInfoVersion=1.3.0 +VersionInfoTextVersion=1.3.0 +VersionInfoProductVersion=1.3.0 +VersionInfoCopyright=2010 +AppCopyright=2010 + +; These won't change +VersionInfoCompany=Imprudence +AppPublisher=The Imprudence Project +AppPublisherURL=http://www.imprudenceviewer.org +AppSupportURL=http://www.imprudenceviewer.org +AppUpdatesURL=http://www.imprudenceviewer.org +AllowNoIcons=true +InfoAfterFile=..\windows\README.txt +OutputDir=C:\ +SetupIconFile=..\windows\imp_icon.ico +Compression=lzma2/ultra64 +InternalCompressLevel=ultra64 +SolidCompression=true +PrivilegesRequired=poweruser +AllowRootDirectory=true +WizardImageFile=..\windows\imprudence_installer_icon_left.bmp +WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp +SetupLogging=true + +[Languages] +Name: english; MessagesFile: compiler:Default.isl + +[Tasks] +Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce +Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce +Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce +; TODO: use scripting for something like this on uninstall: +; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: + +[Files] +Source: C:\imp_1.3\imprudence.exe; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs +Source: C:\imp_1.3\alut.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\ChangeLog.txt; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\charset.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\dbghelp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\featuretable.txt; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\imprudence.exe.config; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\imprudence.url; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstapp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstaudio.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstcdda.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstdshow.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstfft.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstinterfaces.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstnetbuffer.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstpbutils.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstriff.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstrtp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstrtsp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstsdp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgsttag.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgstvideo.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libjpeg.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libmp3lame-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libneon-27.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libogg-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libopenjpeg-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libpng12-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libschroedinger-1.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libspeex-1.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\libxml2.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\Microsoft.VC80.CRT.manifest; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\msvcp80.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\msvcr80.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\nspr4.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\nss3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\nssckbi.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\openal32.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\plc4.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\plds4.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\smime3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\softokn3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\ssl3.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\xpcom.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\xul.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\xvidcore.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\zlib1.dll; DestDir: {app}; Flags: ignoreversion + +; Voice files +Source: C:\imp_1.3\ortp.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\SLVoice.exe; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion +Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion + +; Old files we don't use anymore +; Source: C:\imp_1.3\dronesettings.xml; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\volume_settings.xml; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\srtp.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\ssleay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\tntk.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\libeay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: C:\imp_1.3\lsl_guide.html; DestDir: {app}; Flags: ignoreversion + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files +;Source: C:\imp_1.3\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages: + +[Registry] +Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life +Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol +Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\imprudence.exe +Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\imprudence.exe --settings settings_imprudence.xml -url ""%1"""; Languages: +; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib +; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} + +[Icons] +Name: {group}\{cm:UninstallProgram,Imprudence}; Filename: {uninstallexe} +Name: {commondesktop}\Imprudence; Filename: {app}\imprudence.exe; Tasks: desktopicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}; IconIndex: 0 +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app} +Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0; Parameters: --settings settings_imprudence.xml + +[Run] +Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall +Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different + +[UninstallDelete] +Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: +Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: +Name: {userappdata}\Imprudence\user_settings\settings_imprudence.xml; Type: files; Languages: +; 1.2 and lower cache location: +Name: {userappdata}\Imprudence\cache; Type: filesandordirs +; 1.3 and higher cache location: +Name: {localappdata}\Imprudence\cache; Type: filesandordirs +Name: {userappdata}\Imprudence\logs; Type: filesandordirs +Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs +Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs +Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs + +[InstallDelete] +; Name: {app}\*.dll; Type: files; Tasks: ; Languages: +Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: +; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages: +; Name: {app}\skins\silver\xui\*; Type: filesandordirs; Tasks: ; Languages: +Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs +Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs +; Breaks the browser if installing on top of 1.1: +Name: {app}\gksvggdiplus.dll; Type: files; Tasks: ; Languages: diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss new file mode 100644 index 0000000..d89a074 --- /dev/null +++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss @@ -0,0 +1,263 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) + +; These will change +AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} +AppName=Imprudence Viewer Experimental Release +AppVerName=Imprudence Viewer 1.4.0 Experimental 2011.03.20 +DefaultDirName={pf}\ImprudenceExperimental +DefaultGroupName=Imprudence Viewer Experimental Release +VersionInfoProductName=Imprudence Viewer Experimental Release +OutputBaseFilename=Imprudence-1.4.0-Experimental-2011.03.20-Setup +VersionInfoVersion=1.4.0 +VersionInfoTextVersion=1.4.0 +VersionInfoProductVersion=1.4.0 +VersionInfoCopyright=2011 +AppCopyright=2011 + +; These won't change +VersionInfoCompany=Imprudence +AppPublisher=The Imprudence Project +AppPublisherURL=http://kokuaviewer.org +AppSupportURL=http://kokuaviewer.org +AppUpdatesURL=http://kokuaviewer.org +AllowNoIcons=true +InfoAfterFile=..\windows\README.txt +OutputDir=C:\imprudence_installers +SetupIconFile=..\windows\imp_icon.ico +Compression=lzma2/ultra64 +InternalCompressLevel=ultra64 +SolidCompression=true +;PrivilegesRequired=poweruser +AllowRootDirectory=true +WizardImageFile=..\windows\imprudence_installer_icon_left.bmp +WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp +SetupLogging=true + +[Languages] +Name: english; MessagesFile: compiler:Default.isl + +[Tasks] +Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce +Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce +Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce +; TODO: use scripting for something like this on uninstall: +; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: + +[Files] +Source: ..\..\..\build-vc80\newview\release\package\imprudence.exe; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs +Source: ..\..\..\build-vc80\newview\release\package\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs +Source: ..\..\..\build-vc80\newview\release\package\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs +Source: ..\..\..\build-vc80\newview\release\package\skins\*; DestDir: {app}\skins; Flags: ignoreversion recursesubdirs createallsubdirs +Source: ..\..\..\build-vc80\newview\release\package\doc\*; DestDir: {app}\doc; Flags: ignoreversion recursesubdirs createallsubdirs +Source: ..\..\..\build-vc80\newview\release\package\llplugin\*; DestDir: {app}\llplugin; Flags: ignoreversion recursesubdirs createallsubdirs +Source: ..\..\..\build-vc80\newview\release\package\alut.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\ChangeLog.txt; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\dbghelp.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\featuretable.txt; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\gpu_table.txt; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\imprudence.url; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libapr-1.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libapriconv-1.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libaprutil-1.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libhunspell.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\llcommon.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\llkdu.dll.2.config; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\openal32.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\OpenJPEG.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\SLPlugin.exe; DestDir: {app}; Flags: ignoreversion + +; Gstreamer-specific files below +Source: ..\..\..\build-vc80\newview\release\package\lib\*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs createallsubdirs +Source: ..\..\..\build-vc80\newview\release\package\avcodec-gpl-52.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\avdevice-gpl-52.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\avfilter-gpl-1.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\avformat-gpl-52.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\avutil-gpl-50.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\iconv.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\liba52-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libbz2.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libcelt-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libdca-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libexpat-1.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libfaad-2.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libFLAC-8.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgcrypt-11.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgio-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libglib-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgmodule-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgnutls-26.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgobject-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgpg-error-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstapp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstaudio-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstbase-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstcontroller-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstdataprotocol-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstfft-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstinterfaces-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstnet-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstnetbuffer-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstpbutils-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstphotography-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstreamer-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstriff-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstrtp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstrtsp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstsdp-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstsignalprocessor-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgsttag-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgstvideo-0.10.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libgthread-2.0-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libmms-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libmpeg2-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libneon-27.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libogg-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\liboil-0.3-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libsoup-2.4-1.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libtasn1-3.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libtheora-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libtheoradec-1.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libvorbis-0.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libvorbisenc-2.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libvorbisfile-3.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libwavpack-1.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libx264-67.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libxml2-2.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\libxml2.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\SDL.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\xvidcore.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\z.dll; DestDir: {app}; Flags: ignoreversion + +; Voice files +Source: ..\..\..\build-vc80\newview\release\package\ortp.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\SLVoice.exe; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion +Source: ..\..\..\build-vc80\newview\release\package\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion + +; VC++ 2005 x86 redist +Source: ..\windows\vcredist_x86_VS2005.exe; DestDir: {tmp}; DestName: vcredist_x86_2005.exe + +; Old files we don't use anymore: +; Source: ..\..\..\build-vc80\newview\release\package\dronesettings.xml; DestDir: {app}; Flags: ignoreversion +; Source: ..\..\..\build-vc80\newview\release\package\volume_settings.xml; DestDir: {app}; Flags: ignoreversion +; Source: ..\..\..\build-vc80\newview\release\package\srtp.dll; DestDir: {app}; Flags: ignoreversion +; Source: ..\..\..\build-vc80\newview\release\package\ssleay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: ..\..\..\build-vc80\newview\release\package\tntk.dll; DestDir: {app}; Flags: ignoreversion +; Source: ..\..\..\build-vc80\newview\release\package\libeay32.dll; DestDir: {app}; Flags: ignoreversion +; Source: ..\..\..\build-vc80\newview\release\package\lsl_guide.html; DestDir: {app}; Flags: ignoreversion + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files +;Source: ..\..\..\build-vc80\newview\release\package\msvcr71.dll; DestDir: {app}; Flags: ignoreversion; MinVersion: 0,6.01; Tasks: ; Languages: + +[Icons] +Name: {group}\{cm:UninstallProgram,Imprudence Experimental}; Filename: {uninstallexe} +Name: {commondesktop}\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: desktopicon; WorkingDir: {app}; IconIndex: 0 +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; WorkingDir: {app} +Name: {group}\Imprudence Experimental; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0 + +[Run] +Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall +Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different +Filename: {tmp}\vcredist_x86_2005.exe; Parameters: "/q:a /c:""VCREDI~1.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Flags: runhidden + +[UninstallDelete] +Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: +Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: +Name: {userappdata}\Imprudence\user_settings\settings_imprudence_experimental.xml; Type: files; Languages: +; 1.2 and lower cache location: +Name: {userappdata}\Imprudence\cache; Type: filesandordirs +; 1.3 and higher cache location: +Name: {localappdata}\Imprudence\cache; Type: filesandordirs +Name: {userappdata}\Imprudence\logs; Type: filesandordirs +Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs +Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs +Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs + +[InstallDelete] +; Name: {app}\*.dll; Type: files; Tasks: ; Languages: +Name: {app}\lib\gstreamer-plugins\*; Type: filesandordirs; Tasks: ; Languages: +; Name: {app}\skins\default\xui\*; Type: filesandordirs; Tasks: ; Languages: +; Name: {app}\skins\silver\xui\*; Type: filesandordirs; Tasks: ; Languages: +Name: C:\Documents and Settings\{username}\.gstreamer-0.10\*; Type: filesandordirs +Name: C:\Users\{username}\.gstreamer-0.10\*; Type: filesandordirs +; Breaks the browser if installing on top of 1.1: +Name: {app}\gksvggdiplus.dll; Type: files; Tasks: ; Languages: + +; Pre-plugin files: +Name: {app}\charset.dll; Type: files; Tasks: ; Languages: +Name: {app}\freebl3.dll; Type: files; Tasks: ; Languages: +Name: {app}\glew32.dll; Type: files; Tasks: ; Languages: +Name: {app}\iconv.dll; Type: files; Tasks: ; Languages: +Name: {app}\intl.dll; Type: files; Tasks: ; Languages: +Name: {app}\js3250.dll; Type: files; Tasks: ; Languages: +Name: {app}\libcairo-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libfaad-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgcrypt-11.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgio-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libglib-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgmodule-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgnutls-26.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgobject-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgpg-error-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstapp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstaudio.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstaudio-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstbase-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstcdda.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstcontroller-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstdataprotocol-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstdshow.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstfft.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstinterfaces.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstnet-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstnetbuffer.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstpbutils.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstreamer-0.10.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstriff.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstrtp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstrtsp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstsdp.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgsttag.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgstvideo.dll; Type: files; Tasks: ; Languages: +Name: {app}\libgthread-2.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libjpeg.dll; Type: files; Tasks: ; Languages: +Name: {app}\libmp3lame-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libneon-27.dll; Type: files; Tasks: ; Languages: +Name: {app}\libogg-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\liboil-0.3-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libopenjpeg-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libpng12-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libschroedinger-1.0-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libspeex-1.dll; Type: files; Tasks: ; Languages: +Name: {app}\libtheora-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libvorbis-0.dll; Type: files; Tasks: ; Languages: +Name: {app}\libvorbisenc-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libxml2-2.dll; Type: files; Tasks: ; Languages: +Name: {app}\libxml2.dll; Type: files; Tasks: ; Languages: +Name: {app}\nspr4.dll; Type: files; Tasks: ; Languages: +Name: {app}\nss3.dll; Type: files; Tasks: ; Languages: +Name: {app}\nssckbi.dll; Type: files; Tasks: ; Languages: +Name: {app}\plc4.dll; Type: files; Tasks: ; Languages: +Name: {app}\plds4.dll; Type: files; Tasks: ; Languages: +Name: {app}\RELEASE_NOTES.txt; Type: files; Tasks: ; Languages: +Name: {app}\smime3.dll; Type: files; Tasks: ; Languages: +Name: {app}\softokn3.dll; Type: files; Tasks: ; Languages: +Name: {app}\ssl3.dll; Type: files; Tasks: ; Languages: +Name: {app}\xpcom.dll; Type: files; Tasks: ; Languages: +Name: {app}\xul.dll; Type: files; Tasks: ; Languages: +Name: {app}\xvidcore.dll; Type: files; Tasks: ; Languages: +Name: {app}\zlib1.dll; Type: files; Tasks: ; Languages: + +; We don't distribute the CRT like this anymore; kill old files +Name: {app}\SLPlugin.exe.config; Type: files; Tasks: ; Languages: +Name: {app}\Microsoft.VC80.CRT.manifest; Type: files; Tasks: ; Languages: +Name: {app}\msvcp80.dll; Type: files; Tasks: ; Languages: +Name: {app}\msvcr80.dll; Type: files; Tasks: ; Languages: +Name: {app}\imprudence.exe.config; Type: files; Tasks: ; Languages: diff --git a/linden/install.xml b/linden/install.xml index 4e4a7c6..5772a1b 100755 --- a/linden/install.xml +++ b/linden/install.xml @@ -179,9 +179,9 @@ common md5sum - a6221f9f81be1f044ec1d32c93b11ad9 + 67c89885dbac9b02a545dac5d39ba4a0 url - http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110314.tar.bz2 + http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110320.tar.bz2 -- cgit v1.1 From 26480cbf67aea855c3b1df14d9dcc7f5c0767c5f Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 20 Mar 2011 14:30:08 -0700 Subject: Fixed #786: icon_top_pick.tga contains the SL logo --- linden/install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linden/install.xml b/linden/install.xml index 5772a1b..7ff8dc0 100755 --- a/linden/install.xml +++ b/linden/install.xml @@ -179,9 +179,9 @@ common md5sum - 67c89885dbac9b02a545dac5d39ba4a0 + 940f85fb8c629b7944688e812a089549 url - http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110320.tar.bz2 + http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110321.tar.bz2 -- cgit v1.1 From b88683f8a368093b14e7c94558d7b352a06a6458 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 20 Mar 2011 15:48:09 -0700 Subject: Fixed tab order on login screen --- .../skins/default/xui/en-us/panel_login.xml | 86 ++++++++++++---------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml index 16dd4ad..9499239 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml @@ -30,32 +30,6 @@ - - - - Start location: - - - - My Home - - - My Last Location - - - <Type region name> - - - - - - - Grid: - - + -