From d77dde207b00abbc05269773b108e71aeb48209c Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:45:32 -0500 Subject: Second Life viewer sources 1.19.0.5 --- linden/indra/llcommon/llversionviewer.h | 2 +- linden/indra/llxml/llcontrol.cpp | 4 ++ linden/indra/llxml/llcontrol.h | 5 +- .../indra/newview/English.lproj/InfoPlist.strings | 4 +- linden/indra/newview/Info-SecondLife.plist | 2 +- linden/indra/newview/llappviewer.cpp | 3 + linden/indra/newview/llcontroldef.cpp | 33 ++++++++++ linden/indra/newview/releasenotes.txt | 72 +++------------------- linden/indra/newview/res/newViewRes.rc | 8 +-- .../newview/skins/xui/en-us/panel_voice_enable.xml | 12 ++-- 10 files changed, 67 insertions(+), 78 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index e23403c..c14efe8 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 19; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 3; +const S32 LL_VERSION_BUILD = 5; const char * const LL_CHANNEL = "Second Life Release"; diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp index b9fa8ff..d185987 100644 --- a/linden/indra/llxml/llcontrol.cpp +++ b/linden/indra/llxml/llcontrol.cpp @@ -682,6 +682,8 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de llassert(control); + mLoadedSettings.insert(name); + switch(control->mType) { case TYPE_F32: @@ -905,6 +907,8 @@ U32 LLControlGroup::loadFromFile(const LLString& filename, BOOL require_declarat llassert(control); + mLoadedSettings.insert(name); + switch(control->mType) { case TYPE_F32: diff --git a/linden/indra/llxml/llcontrol.h b/linden/indra/llxml/llcontrol.h index 4a86adf..e717bf1 100644 --- a/linden/indra/llxml/llcontrol.h +++ b/linden/indra/llxml/llcontrol.h @@ -200,11 +200,14 @@ public: typedef std::map > ctrl_name_table_t; ctrl_name_table_t mNameTable; std::set mWarnings; - + std::set mLoadedSettings; // Filled in with names loaded from settings.xml + public: LLControlGroup(); ~LLControlGroup(); void cleanup(); + bool hasLoaded(const LLString& name) { return mLoadedSettings.find(name) != mLoadedSettings.end(); } + void clearLoaded() { mLoadedSettings.clear(); } // Call once we've done any settings tweaks which may need this data LLControlBase* getControl(const LLString& name); LLSD registerListener(const LLString& name, LLSimpleListenerObservable *listener); diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings index 9e5db0d..608a6ad 100644 --- a/linden/indra/newview/English.lproj/InfoPlist.strings +++ b/linden/indra/newview/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Second Life"; -CFBundleShortVersionString = "Second Life version 1.19.0.3"; -CFBundleGetInfoString = "Second Life version 1.19.0.3, Copyright 2004-2007 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.19.0.5"; +CFBundleGetInfoString = "Second Life version 1.19.0.5, Copyright 2004-2007 Linden Research, Inc."; diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist index 050aa93..e257d6f 100644 --- a/linden/indra/newview/Info-SecondLife.plist +++ b/linden/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.19.0.3 + 1.19.0.5 CSResourcesFileMapped diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 30ac8fa..cda3ba5 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -562,6 +562,8 @@ int parse_args(int argc, char **argv) for (j = 1; j < argc; j++) { + // Used to show first chunk of each argument passed in the + // window title. gArgs += argv[j]; gArgs += " "; @@ -865,6 +867,7 @@ int parse_args(int argc, char **argv) // that someone can use IE (or potentially other browsers) // and do the rough equivalent of command injection and // steal passwords. Phoenix. SL-55321 + return 0; } else if (!strcmp(argv[j], "-ignorepixeldepth")) { diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp index 2255496..124361b 100644 --- a/linden/indra/newview/llcontroldef.cpp +++ b/linden/indra/newview/llcontroldef.cpp @@ -1507,14 +1507,47 @@ void declare_settings() // Setting name is shared with win_crash_logger gCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes " "(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)"); + } + void fixup_settings() { #if LL_RELEASE_FOR_DOWNLOAD // Force some settings on startup gSavedSettings.setBOOL("AnimateTextures", TRUE); // Force AnimateTextures to always be on #endif + + // Special code to tweak with defaults + std::string last_major, last_minor, last_patch; + S32 digit = gLastRunVersion.find_first_of("0123456789"); + S32 dot = gLastRunVersion.find_first_of('.', digit); + if (dot != std::string::npos && digit != std::string::npos) + { + last_major = gLastRunVersion.substr(digit, dot-digit); + digit = dot+1; + dot = gLastRunVersion.find_first_of('.', digit); + } + if (dot != std::string::npos && digit != std::string::npos) + { + last_minor = gLastRunVersion.substr(digit, dot-digit); + digit = dot+1; + dot = gLastRunVersion.find_first_of('.', digit); + } + if (dot != std::string::npos && digit != std::string::npos) + { + last_patch = gLastRunVersion.substr(digit, dot-digit); + } + // 1.18.x -> 1.19.x + if (last_major == "1" && last_minor == "18") + { + if (!gSavedSettings.hasLoaded("EnableVoiceChat")) + { + gSavedSettings.setBOOL("EnableVoiceChat", FALSE); // Default 1.18.x users to voice chat disabled + } + } + + gSavedSettings.clearLoaded(); } //////////////////////////////////////////////////////////////////////////// diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt index b7fb7e6..f745a7e 100644 --- a/linden/indra/newview/releasenotes.txt +++ b/linden/indra/newview/releasenotes.txt @@ -1,67 +1,12 @@ -Release Notes for Second Life 1.19.0(4) February 26th, 2008 -===================================== - -Fixes: -* VWR-4921: not recognising in Linux that client is already running -* VWR-4960: Active Speakers list does not clear in 1.19.0 (2) - - -Release Notes for Second Life 1.19.0(3) February 22nd, 2008 -===================================== - -Fixes: -* Land for sale icon in menubar overlaps push object restriction icon -* Upload Animation window: Button missing in Stopped window state -* Client crashes when viewing the proposals tab in group information -* My Landmarks dropdown list adds additional entries every time the world map is opened -* Groups > Proposals > Past Vote text gets chomped -* Defaulted buttons in floater dialogs remain highlighted when not in focus -* VWR-4556: 1.19.0: Ban lines around limited-access parcels are no longer visible -* VWR-3410: Too many typing sounds when chatting in Japanese - - -Release Notes for Second Life 1.19.0(2) February 13th, 2008 -===================================== - -Fixes: -* Preferences window docks at an offscreen position and cannot be moved vertically -* Communicate window has low framerate for group ims. -* Viewer freeze and delay in opening map -* Visible flashing of prim highlights when editing -* Parcel audio play setting is not remembered when crossing over a parcel with no media -* Alt and left/right arrow keys dont move you between tabs -* Login Page > SL Release link overlaps Quit when viewer resized -* Redocking the Contact list causes the communicate UI to get ugly -* Clicking on gestures button moves open windows -* Pressing escape does not cause the chat history or inventory windows to lose focus -* Toggling voice causes layout problems in toolbar -* Problems loading certain settings files -* Deutsch "System Default" is translated as "System Error" in language preferences -* Viewer crash just after login -* Linux compile issue with g++ 4 -* Debug settings overrides do not work for booleans. -* reverted floater_test.xml to empty floater. - -Release Notes for Second Life 1.19.0(1) February 7th, 2008 -===================================== -Changes: -* Added second set of translated strings -* Region info message is now a passive notification -* Changed default SL window size to 1000x700, to allow buttons in UI to have proper labels - -Fixes: -* Preferences > Web has truncated text in the Address: section -* Korean viewer crashes on startup -* Stand up button etc dissapear offscreen after using mouselook -* Client-readme-voice.txt missing from open source distribution -* Clicking on another users classifieds ad then closing asks you to save changes -* Checking to select a role does not enable the apply button -* Stray 'Done" on the Profile Web tab - - -Release Notes for Second Life 1.19.0(0) February 1st, 2008 +Release Notes for Second Life 1.19.0(4) February 28th, 2008 ===================================== New features and changes: +* Voice +** Voice Chat is now enabled by default to allow Residents to hear other Residents. +** A microphone is required to speak to other Residents. +** Push-to-Talk is the default mode for transmitting voice. +** These settings can be modified via the Voice Chat tab of the Preferences dialog. + * Age Verification: ** The user interface for parcel and estate access has been clarified and improved. ** Added the ability to restrict access to parcels and estates to age verified adults. @@ -79,7 +24,6 @@ New features and changes: ** Remove "New Account..." and "Preferences" buttons from login screen for 1.19.0 Fixes: -* SVC-750: Avatar sitting on a prim no longer able to be manipulated with llSetLinkPrimitiveParams * SVC-930: Prims set for sale - prices are incorrectly set when multiple prims taken to inventory and rezzed * SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled * VWR-1125: Clicking Title Bar While Mouselook'd Repositions SL Window @@ -171,6 +115,7 @@ Fixes: * Viewer crashes in assert when playing Sword Strike animation * Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667) * Disable QuickTime when the installed version is less than version with RTSP exploit +* Korean viewer crashes on startup * Move fullscreen message from login screen to viewer prefs * linux client doesn't recognise that a viewer is already running (slurl crapout) * Search results window displays "s..." and "n..." instead of "searching..." and "none found" @@ -179,6 +124,7 @@ Fixes: * SEC-17 Ability to Access Sculpted Prim Textures from Database without owning actual sculpt texture, allowing for people to "steal" sculpts. * info window does not pop up when transitioning from a Havok1 to Havok4 region * Repoint Report Bug... Viewer link to Pjira +* Upload Animation window: Button missing in Stopped window state Source changes: * Upgrade Win32 libvorbis to v1.2 diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc index 411a17a..691d325 100644 --- a/linden/indra/newview/res/newViewRes.rc +++ b/linden/indra/newview/res/newViewRes.rc @@ -228,8 +228,8 @@ TOOLPIPETTE CURSOR "toolpipette.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,19,0,3 - PRODUCTVERSION 1,19,0,3 + FILEVERSION 1,19,0,5 + PRODUCTVERSION 1,19,0,5 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -246,12 +246,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "1.19.0.3" + VALUE "FileVersion", "1.19.0.5" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "1.19.0.3" + VALUE "ProductVersion", "1.19.0.5" END END BLOCK "VarFileInfo" diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml index 45d2541..02d5697 100644 --- a/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml +++ b/linden/indra/newview/skins/xui/en-us/panel_voice_enable.xml @@ -35,7 +35,7 @@ font="SansSerifSmall" left_delta="0" width="400" - height="30" + height="50" length="1" max_length="65535" hide_border="true" @@ -44,18 +44,18 @@ allow_html="false" mouse_opaque="true" tab_stop="false" - word_wrap="true">Do you want to enable Voice Chat now? + word_wrap="true">Voice Chat is enabled by default. Do you wish to continue using Voice Chat? + mouse_opaque="true" name="voice_enable" width="364" bottom_delta="-30"> - Yes, enable Voice Chat. + Yes, continue using Voice Chat. - No, do not enable Voice Chat at this time. + No, disable Voice Chat. @@ -95,4 +95,4 @@ tab_stop="false" word_wrap="true">Click the Next button to configure Voice Chat preferences or click Finish to continue using Second Life. - \ No newline at end of file + -- cgit v1.1