From 56ea5b27fdfa3a24ad29600e69cb7ef99777a1ee Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 23 Jul 2015 03:34:42 -0400 Subject: [PATCH 001/136] haisujs axune padoxcunal aerngralt --- indra/newview/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b39c82054..c2febcaae 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1346,7 +1346,8 @@ set(viewer_APPSETTINGS_FILES app_settings/cmd_line.xml app_settings/grass.xml app_settings/high_graphics.xml - app_settings/keys.ini + app_settings/keys.xml + app_settings/keysZQSD.xml app_settings/keywords.ini app_settings/logcontrol.xml app_settings/low_graphics.xml From 85434052192d434baaf6d482e38a281069dcfc17 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 23 Jul 2015 14:36:27 -0400 Subject: [PATCH 002/136] GCC blahblah --- indra/llxml/llxmlnode.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index bdfd161cd..f3c207aa6 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -43,8 +43,6 @@ #include "lluuid.h" //#include "lldir.h" // Do not need. -const S32 MAX_COLUMN_WIDTH = 80; - // static BOOL LLXMLNode::sStripEscapedStrings = TRUE; BOOL LLXMLNode::sStripWhitespaceValues = FALSE; @@ -147,13 +145,15 @@ LLXMLNodePtr LLXMLNode::deepCopy() for (LLXMLChildList::iterator iter = mChildren->map.begin(); iter != mChildren->map.end(); ++iter) { - newnode->addChild(iter->second->deepCopy()); + LLXMLNodePtr temp_ptr_for_gcc(iter->second->deepCopy()); + newnode->addChild(temp_ptr_for_gcc); } } for (LLXMLAttribList::iterator iter = mAttributes.begin(); iter != mAttributes.end(); ++iter) { - newnode->addChild(iter->second->deepCopy()); + LLXMLNodePtr temp_ptr_for_gcc(iter->second->deepCopy()); + newnode->addChild(temp_ptr_for_gcc); } return newnode; From fd5dae59ae60dca384b21dca24cbd38bbfc8f401 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Thu, 23 Jul 2015 14:41:53 -0400 Subject: [PATCH 003/136] Stop hurting my feelings, gcc, I try so hard and you just don't seem to care. --- indra/newview/llappviewer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index aded2f823..aa5ce568e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -611,6 +611,7 @@ void load_default_bindings(bool zqsd) } } +/* Singu unused namespace { // With Xcode 6, _exit() is too magical to use with boost::bind(), so provide // this little helper function. @@ -619,6 +620,7 @@ void fast_exit(int rc) _exit(rc); } } +*/ bool LLAppViewer::init() { From 31867a8bbf6c72b80b4b2798a5b81d7e377cd589 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Sat, 25 Jul 2015 13:09:10 -0400 Subject: [PATCH 004/136] Alchemy crouch toggle code sync. --- indra/newview/llagent.cpp | 5 +++-- indra/newview/llappviewer.cpp | 2 -- indra/newview/llviewerkeyboard.cpp | 10 +++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index ae475e2c4..c962a66fb 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -650,7 +650,8 @@ void LLAgent::moveUp(S32 direction) setControlFlags(AGENT_CONTROL_UP_NEG | AGENT_CONTROL_FAST_UP); } - if (!mCrouch) camera_reset_on_motion(); + if (!mCrouch) + camera_reset_on_motion(); } //----------------------------------------------------------------------------- @@ -694,7 +695,7 @@ void LLAgent::movePitch(F32 mag) bool LLAgent::isCrouching() const { - return mCrouch && !getFlying(); // Never crouch when flying + return mCrouch && !getFlying(); } diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index aa5ce568e..1986802d1 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1255,9 +1255,7 @@ bool LLAppViewer::mainLoop() joystick->scanJoystick(); gKeyboard->scanKeyboard(); if (gAgent.isCrouching()) - { gAgent.moveUp(-1); - } } diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index 9b0649070..89b52d8b5 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -70,13 +70,14 @@ LLViewerKeyboard gViewerKeyboard; void agent_jump( EKeystate s ) { if( KEYSTATE_UP == s ) return; + static LLCachedControl sAutomaticFly(gSavedSettings, "AutomaticFly"); F32 time = gKeyboard->getCurKeyElapsedTime(); S32 frame_count = ll_round(gKeyboard->getCurKeyElapsedFrameCount()); if( time < FLY_TIME || frame_count <= FLY_FRAMES || gAgent.upGrabbed() - || !gSavedSettings.getBOOL("AutomaticFly")) + || !sAutomaticFly()) { gAgent.moveUp(1); } @@ -91,7 +92,10 @@ void agent_toggle_down( EKeystate s ) { if (KEYSTATE_UP == s) return; - if (KEYSTATE_DOWN == s && !gAgent.getFlying() && gSavedSettings.getBOOL("SGShiftCrouchToggle")) + static LLCachedControl sCrouchToggle(gSavedSettings, "SGShiftCrouchToggle"); + if (KEYSTATE_DOWN == s + && !gAgent.getFlying() + && sCrouchToggle()) { gAgent.toggleCrouch(); } @@ -101,7 +105,7 @@ void agent_toggle_down( EKeystate s ) void agent_push_down( EKeystate s ) { - if( KEYSTATE_UP == s ) return; + if( KEYSTATE_UP == s ) return; gAgent.moveUp(-1); } From 3c69f34b2fcc7a38dc26d12210e19daed8eb2d3f Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Sun, 26 Jul 2015 07:30:27 -0400 Subject: [PATCH 005/136] Fix duplicate notification templates Thanks for pointing this out, MiVo. --- .../skins/default/xui/en-us/notifications.xml | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml index ff05f179f..ae9ddb64e 100644 --- a/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/indra/newview/skins/default/xui/en-us/notifications.xml @@ -1306,48 +1306,6 @@ Port settings take effect after you restart [APP_NAME]. Connection to Socks5 proxy [PROXY] was successful. - -The Socks5 proxy "[PROXY]" refused the connection, not allowed by rule set - - - -The Socks5 proxy "[PROXY]" refused the connection, could not open TCP channel - - - -The Socks5 proxy "[PROXY]" refused the selected authentication system - - - -The Socks5 proxy "[PROXY]" reported your credentials are invalid - - - -The Socks5 proxy "[PROXY]" refused the UDP associate request - - - -Could not connect to Socks5 proxy server "[PROXY]" - - Date: Mon, 27 Jul 2015 18:52:00 -0400 Subject: [PATCH 006/136] Fix owner names being cut off in About Land floater SV-1930 #resolve --- indra/newview/skins/default/xui/en-us/floater_about_land.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/indra/newview/skins/default/xui/en-us/floater_about_land.xml index 24669cf48..ee1943b37 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about_land.xml @@ -66,7 +66,7 @@ + mouse_opaque="true" name="OwnerText" v_pad="0"> Leyla Linden + + + Loading... + Done + [APP_SITE]/404 + http://search.secondlife.com/ Done [APP_SITE]/404 https://marketplace.secondlife.com/ - - - - - - Loading... - Done - [APP_SITE]/404 - http://search.secondlife.com/ + +