From fdb921e78b7b0e05f6e7e47e0c238bb87ee1afbc Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:45:39 -0500 Subject: Second Life viewer sources 1.19.1.4 --- linden/indra/llcommon/llversionviewer.h | 2 +- linden/indra/llwindow/llwindowsdl.cpp | 16 ++++++++++------ .../indra/newview/English.lproj/InfoPlist.strings | 4 ++-- linden/indra/newview/Info-SecondLife.plist | 2 +- linden/indra/newview/llappviewer.cpp | 6 ++++-- linden/indra/newview/llprefsvoice.cpp | 10 +++++----- linden/indra/newview/llviewerparcelmgr.cpp | 22 +++++++++++----------- linden/indra/newview/llvoiceclient.cpp | 2 +- linden/indra/newview/releasenotes.txt | 10 ++++++++++ linden/indra/newview/res/newViewRes.rc | 8 ++++---- .../newview/skins/xui/de/floater_about_land.xml | 4 ++-- .../newview/skins/xui/de/floater_chat_history.xml | 2 +- .../skins/xui/de/floater_day_cycle_options.xml | 2 +- .../newview/skins/xui/de/floater_env_settings.xml | 3 ++- .../indra/newview/skins/xui/de/floater_water.xml | 2 +- .../skins/xui/de/panel_preferences_audio.xml | 2 +- .../skins/xui/en-us/floater_chat_history.xml | 2 +- .../skins/xui/en-us/panel_preferences_voice.xml | 10 +++++----- .../skins/xui/en-us/panel_voice_options.xml | 8 ++++---- .../newview/skins/xui/ja/floater_about_land.xml | 10 +++++----- .../newview/skins/xui/ja/floater_buy_object.xml | 4 ++-- .../newview/skins/xui/ja/floater_chat_history.xml | 2 +- .../skins/xui/ja/floater_day_cycle_options.xml | 18 +++++++++--------- .../newview/skins/xui/ja/floater_env_settings.xml | 2 +- .../skins/xui/ja/floater_hardware_settings.xml | 4 ++-- .../skins/xui/ja/floater_instant_message.xml | 2 +- .../newview/skins/xui/ja/floater_media_browser.xml | 2 +- linden/indra/newview/skins/xui/ja/panel_audio.xml | 14 +++++++------- .../skins/xui/ja/panel_preferences_audio.xml | 4 ++-- .../skins/xui/ja/panel_preferences_general.xml | 2 +- .../skins/xui/ja/panel_preferences_graphics1.xml | 4 ++-- .../newview/skins/xui/ja/panel_preferences_im.xml | 2 +- .../skins/xui/ja/panel_preferences_input.xml | 2 +- .../newview/skins/xui/ja/panel_preferences_web.xml | 4 ++-- .../skins/xui/ko/floater_day_cycle_options.xml | 4 ++-- .../newview/skins/xui/ko/floater_env_settings.xml | 4 ++-- .../skins/xui/ko/floater_instant_message.xml | 10 +++++----- .../newview/skins/xui/ko/floater_media_browser.xml | 4 ++-- .../newview/skins/xui/ko/floater_snapshot.xml | 4 ++-- .../skins/xui/ko/floater_windlight_options.xml | 2 +- linden/indra/newview/skins/xui/ko/menu_viewer.xml | 4 ++-- .../indra/newview/skins/xui/ko/panel_toolbar.xml | 2 +- 42 files changed, 122 insertions(+), 105 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index 4d8f521..f00657a 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 = 1; -const S32 LL_VERSION_BUILD = 3; +const S32 LL_VERSION_BUILD = 4; const char * const LL_CHANNEL = "Second Life Release"; diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp index 3eb4872..73753c3 100644 --- a/linden/indra/llwindow/llwindowsdl.cpp +++ b/linden/indra/llwindow/llwindowsdl.cpp @@ -2011,12 +2011,16 @@ void LLWindowSDL::gatherInput() // and crashness. (SL-35450) std::string saved_locale = setlocale(LC_ALL, NULL); - // Do a limited number of pumps so SL doesn't starve! - // *TODO: this should ideally be time-limited, not count-limited. - gtk_main_iteration_do(0); // Always do one non-blocking pump - for (int iter=0; iter<10; ++iter) - if (gtk_events_pending()) - gtk_main_iteration(); + // Pump until we've nothing left to do or passed 1/15th of a + // second pumping for this frame. + static LLTimer pump_timer; + pump_timer.reset(); + pump_timer.setTimerExpirySec(1.0f / 15.0f); + do { + // Always do at least one non-blocking pump + gtk_main_iteration_do(0); + } while (gtk_events_pending() && + !pump_timer.hasExpired()); setlocale(LC_ALL, saved_locale.c_str() ); } diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings index 905341e..bb7ddc1 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.1.3"; -CFBundleGetInfoString = "Second Life version 1.19.1.3, Copyright 2004-2008 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.19.1.4"; +CFBundleGetInfoString = "Second Life version 1.19.1.4, Copyright 2004-2008 Linden Research, Inc."; diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist index 45ee9f6..492e589 100644 --- a/linden/indra/newview/Info-SecondLife.plist +++ b/linden/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.19.1.3 + 1.19.1.4 CSResourcesFileMapped diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 7cee898..cb94e51 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -538,7 +538,7 @@ static void saved_settings_to_globals() #endif // propagate push to talk preference to current status - gSavedSettings.setBOOL("PTTCurrentlyEnabled", gSavedSettings.getBOOL("EnablePushToTalk")); + gSavedSettings.setBOOL("PTTCurrentlyEnabled", TRUE); //gSavedSettings.getBOOL("EnablePushToTalk")); settings_setup_listeners(); @@ -2304,7 +2304,9 @@ bool LLAppViewer::doConfigFromCommandLine() for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter) { - llinfos << "argument: '" << (token_iter->c_str()) << "'" << llendl; + // people can put their password in the file. :( + // http://jira.secondlife.com/browse/SEC-42 + //llinfos << "argument: '" << (token_iter->c_str()) << "'" << llendl; arglist.push_back(*token_iter); } diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp index 9751ea7..773ddfe 100644 --- a/linden/indra/newview/llprefsvoice.cpp +++ b/linden/indra/newview/llprefsvoice.cpp @@ -93,7 +93,7 @@ void LLPrefsVoiceLogic::init() mEnableVoice = gSavedSettings.getBOOL("EnableVoiceChat"); mVoiceCallsFriendsOnly = gSavedSettings.getBOOL("VoiceCallsFriendsOnly"); - mEnablePushToTalk = gSavedSettings.getBOOL("EnablePushToTalk"); +// mEnablePushToTalk = gSavedSettings.getBOOL("EnablePushToTalk"); mModifier = gSavedSettings.getString("PushToTalkButton"); mPushToTalkToggle = gSavedSettings.getBOOL("PushToTalkToggle"); mEarLocation = gSavedSettings.getS32("VoiceEarLocation"); @@ -122,17 +122,17 @@ void LLPrefsVoiceLogic::refresh() mPanel->childSetEnabled("push_to_talk_check", enable); mPanel->childSetEnabled("push_to_talk_label", enable); mPanel->childSetEnabled("voice_call_friends_only_check", enable); - mPanel->childSetEnabled("push_to_talk_toggle_check", enable /*&& gSavedSettings.getBOOL("EnablePushToTalk")*/); + mPanel->childSetEnabled("push_to_talk_toggle_check", enable); mPanel->childSetEnabled("ear_location", enable); - mPanel->childSetEnabled("set_voice_hotkey_button", enable /*&& gSavedSettings.getBOOL("EnablePushToTalk")*/); - mPanel->childSetEnabled("set_voice_middlemouse_button", enable /*&& gSavedSettings.getBOOL("EnablePushToTalk")*/); + mPanel->childSetEnabled("set_voice_hotkey_button", enable); + mPanel->childSetEnabled("set_voice_middlemouse_button", enable); } void LLPrefsVoiceLogic::cancel() { gSavedSettings.setBOOL("EnableVoiceChat", mEnableVoice); gSavedSettings.setBOOL("VoiceCallsFriendsOnly", mVoiceCallsFriendsOnly); - gSavedSettings.setBOOL("EnablePushToTalk", mEnablePushToTalk ); +// gSavedSettings.setBOOL("EnablePushToTalk", mEnablePushToTalk ); gSavedSettings.setString("PushToTalkButton", mModifier); gSavedSettings.setBOOL("PushToTalkToggle", mPushToTalkToggle ); gSavedSettings.setS32("VoiceEarLocation", mEarLocation); diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp index de88ac0..ddc67d0 100644 --- a/linden/indra/newview/llviewerparcelmgr.cpp +++ b/linden/indra/newview/llviewerparcelmgr.cpp @@ -1259,28 +1259,30 @@ const LLString& LLViewerParcelMgr::getAgentParcelName() const void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_agent_region) { - if (!parcel) return; + if(!parcel) return; if(!gWorldp) return; - LLViewerRegion *region = use_agent_region ? gAgent.getRegion() : gWorldp->getRegionFromPosGlobal( mWestSouth ); + //llinfos << "passed parcel: " << parcel->getName() << llendl; + + LLViewerRegion* region = use_agent_region ? + gAgent.getRegion() : gWorldp->getRegionFromPosGlobal( mWestSouth ); if (!region) return; + //llinfos << "found region: " << region->getName() << llendl; LLSD body; - std::string url = gAgent.getRegion()->getCapability("ParcelPropertiesUpdate"); + std::string url = region->getCapability("ParcelPropertiesUpdate"); if (!url.empty()) { - U32 message_flags = 0x01; // request new properties update from simulator + U32 message_flags = 0x01; body["flags"] = ll_sd_from_U32(message_flags); parcel->packMessage(body); - - llinfos << "Sending parcel properties update via capability to:" << url << llendl; - + llinfos << "Sending parcel properties update via capability to: " + << url << llendl; LLHTTPClient::post(url, body, new LLHTTPClient::Responder()); } else { - LLMessageSystem *msg = gMessageSystem; - + LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_ParcelPropertiesUpdate); msg->nextBlockFast(_PREHASH_AgentData); msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() ); @@ -1295,8 +1297,6 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_ag msg->sendReliable( region->getHost() ); } - - } diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp index 45935db..f0dafef 100644 --- a/linden/indra/newview/llvoiceclient.cpp +++ b/linden/indra/newview/llvoiceclient.cpp @@ -848,7 +848,7 @@ LLVoiceClient::LLVoiceClient() // Load initial state from prefs. mVoiceEnabled = gSavedSettings.getBOOL("EnableVoiceChat"); - mUsePTT = gSavedSettings.getBOOL("EnablePushToTalk"); + mUsePTT = TRUE; //gSavedSettings.getBOOL("EnablePushToTalk"); std::string keyString = gSavedSettings.getString("PushToTalkButton"); setPTTKey(keyString); mPTTIsToggle = gSavedSettings.getBOOL("PushToTalkToggle"); diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt index 49cc03d..10175ab 100644 --- a/linden/indra/newview/releasenotes.txt +++ b/linden/indra/newview/releasenotes.txt @@ -1,3 +1,13 @@ +Release Notes for Second Life 1.19.1(4) March 28th, 2008 +===================================== +* Fixed a bug causing the viewer to update the wrong parcel. +* SEC-42: Do not log contents of arguments.txt. +* revert name of "Local Chat(history)" tab to "Local Chat" +* Removed confusing "Start in Push-to-Talk mode" preference. +* JA, KO, DE localizations are truncated on Preferences>Graphics tab> Run in a window descriptor +* commit JA,KO,DE localization changes to accommodate truncations +* + +"D" crashes mac client (Updated llmozlib) + Release Notes for Second Life 1.19.1(3) March 26th, 2008 ===================================== Changes and fixes: diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc index 2738fa4..6254613 100644 --- a/linden/indra/newview/res/newViewRes.rc +++ b/linden/indra/newview/res/newViewRes.rc @@ -231,8 +231,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,19,1,3 - PRODUCTVERSION 1,19,1,3 + FILEVERSION 1,19,1,4 + PRODUCTVERSION 1,19,1,4 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -249,12 +249,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "1.19.1.3" + VALUE "FileVersion", "1.19.1.4" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "1.19.1.3" + VALUE "ProductVersion", "1.19.1.4" END END BLOCK "VarFileInfo" diff --git a/linden/indra/newview/skins/xui/de/floater_about_land.xml b/linden/indra/newview/skins/xui/de/floater_about_land.xml index fdb7257..62664c7 100644 --- a/linden/indra/newview/skins/xui/de/floater_about_land.xml +++ b/linden/indra/newview/skins/xui/de/floater_about_land.xml @@ -451,7 +451,7 @@ - Beschreibung: + Inhalt: @@ -471,7 +471,7 @@ Optionen: tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Musik-URL sehen können." /> - Mediengröße: + Größe: diff --git a/linden/indra/newview/skins/xui/de/floater_chat_history.xml b/linden/indra/newview/skins/xui/de/floater_chat_history.xml index 73c0bb8..13644ba 100644 --- a/linden/indra/newview/skins/xui/de/floater_chat_history.xml +++ b/linden/indra/newview/skins/xui/de/floater_chat_history.xml @@ -1,5 +1,5 @@ - +