From 83f4b8a775fcd76ce2a61d3da98cdc91c61fe383 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 11 May 2019 01:40:28 +0300 Subject: Backed out changeset: a1ba5b935f34 --- indra/newview/lltoolpie.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 697db01d11..f184b22ccb 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -111,24 +111,9 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask) mMouseOutsideSlop = FALSE; mMouseDownX = x; mMouseDownY = y; - LLTimer pick_timer; - BOOL pick_rigged = false; //gSavedSettings.getBOOL("AnimatedObjectsAllowLeftClick"); - mPick = gViewerWindow->pickImmediate(x, y, FALSE, pick_rigged); - LLViewerObject *object = mPick.getObject(); - LLViewerObject *parent = object ? object->getRootEdit() : NULL; - if (!object - || object->isAttachment() - || object->getClickAction() == CLICK_ACTION_DISABLED - || (!useClickAction(mask, object, parent) && !object->flagHandleTouch() && !(parent && parent->flagHandleTouch()))) - { - // Unless we are hovering over actionable visible object - // left mouse down always picks transparent (but see handleMouseUp). - // Also see LLToolPie::handleHover() - priorities are a bit different there. - // Todo: we need a more consistent set of rules to work with - mPick = gViewerWindow->pickImmediate(x, y, TRUE /*transparent*/, pick_rigged); - } - LL_INFOS() << "pick_rigged is " << (S32) pick_rigged << " pick time elapsed " << pick_timer.getElapsedTimeF32() << LL_ENDL; + //left mouse down always picks transparent (but see handleMouseUp) + mPick = gViewerWindow->pickImmediate(x, y, TRUE, FALSE); mPick.mKeyMask = mask; mMouseButtonDown = true; -- cgit v1.2.3 From 5de9754e3079e18c855b0b713102b6b65b81af10 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Fri, 8 Mar 2019 17:34:49 -0800 Subject: SL-10702: When attempting a new voice connection, ensure that the voicePump mail drop does not have any outstanding events. --- indra/llcommon/llevents.h | 10 ++++++---- indra/newview/llvoicevivox.cpp | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h index 5d60c63810..d850cb4fcc 100644 --- a/indra/llcommon/llevents.h +++ b/indra/llcommon/llevents.h @@ -582,11 +582,12 @@ public: /// Generate a distinct name for a listener -- see listen() static std::string inventName(const std::string& pfx="listener"); -private: - friend class LLEventPumps; /// flush queued events virtual void flush() {} +private: + friend class LLEventPumps; + virtual void reset(); @@ -675,8 +676,10 @@ public: virtual ~LLEventMailDrop() {} /// Post an event to all listeners - virtual bool post(const LLSD& event); + virtual bool post(const LLSD& event) override; + /// Remove any history stored in the mail drop. + virtual void flush() override { mEventHistory.clear(); LLEventStream::flush(); }; protected: virtual LLBoundListener listen_impl(const std::string& name, const LLEventListener&, const NameList& after, @@ -703,7 +706,6 @@ public: /// Post an event to all listeners virtual bool post(const LLSD& event); -private: /// flush queued events virtual void flush(); diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index cf40058c34..0d3f65502a 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -1460,6 +1460,11 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession) LLSD timeoutResult(LLSDMap("session", "timeout")); + // We are about to start a whole new session. Anything that MIGHT still be in our + // maildrop is going to be stale and cause us much wailing and gnashing of teeth. + // Just flush it all out and start new. + voicePump.flush(); + // It appears that I need to wait for BOTH the SessionGroup.AddSession response and the SessionStateChangeEvent with state 4 // before continuing from this state. They can happen in either order, and if I don't wait for both, things can get stuck. // For now, the SessionGroup.AddSession response handler sets mSessionHandle and the SessionStateChangeEvent handler transitions to stateSessionJoined. -- cgit v1.2.3 From e31f4a352d2dfdcc4ccb1be459382054e354f085 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Tue, 14 May 2019 01:14:54 +0300 Subject: Mac buildfix --- indra/llcommon/llevents.h | 2 +- indra/llui/lllayoutstack.cpp | 1 - indra/newview/llappearancemgr.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h index d850cb4fcc..62d97007ac 100644 --- a/indra/llcommon/llevents.h +++ b/indra/llcommon/llevents.h @@ -683,7 +683,7 @@ public: protected: virtual LLBoundListener listen_impl(const std::string& name, const LLEventListener&, const NameList& after, - const NameList& before); + const NameList& before) override; private: typedef std::list EventList; diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index b1ba725c2f..955e7089f4 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -516,7 +516,6 @@ LLLayoutPanel* LLLayoutStack::findEmbeddedPanel(LLPanel* panelp) const { if (!panelp) return NULL; - e_panel_list_t::const_iterator panel_it; BOOST_FOREACH(LLLayoutPanel* p, mPanels) { if (p == panelp) diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 08daeb0f59..22bcbad7da 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1865,7 +1865,6 @@ bool LLAppearanceMgr::getCanRemoveOutfit(const LLUUID& outfit_cat_id) LLFindNonRemovableObjects filter_non_removable; LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; - LLInventoryModel::item_array_t::const_iterator it; gInventory.collectDescendentsIf(outfit_cat_id, cats, items, false, filter_non_removable); if (!cats.empty() || !items.empty()) { -- cgit v1.2.3 From 59c93cb861a3cc5ef766ec27f82e7c82fe17f54b Mon Sep 17 00:00:00 2001 From: "Steven Harrison (steven)" Date: Fri, 17 May 2019 02:23:49 +0000 Subject: SL-11213 No longer embedding the channel in the viewer release note urls. Update base URLs to match new viewer release note URL --- indra/newview/llappviewer.cpp | 10 ++-------- indra/newview/skins/default/xui/da/strings.xml | 2 +- indra/newview/skins/default/xui/de/strings.xml | 2 +- indra/newview/skins/default/xui/en/strings.xml | 2 +- indra/newview/skins/default/xui/es/strings.xml | 2 +- indra/newview/skins/default/xui/fr/strings.xml | 2 +- indra/newview/skins/default/xui/it/strings.xml | 2 +- indra/newview/skins/default/xui/ja/strings.xml | 2 +- indra/newview/skins/default/xui/pt/strings.xml | 2 +- 9 files changed, 10 insertions(+), 16 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d6695e7f3e..56e8cc8ff4 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3105,17 +3105,11 @@ LLSD LLAppViewer::getViewerInfo() const } // return a URL to the release notes for this viewer, such as: - // http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0.123456 + // https://releasenotes.secondlife.com/viewer/2.1.0.123456.html std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL"); if (! LLStringUtil::endsWith(url, "/")) url += "/"; - std::string channel = LLVersionInfo::getChannel(); - if (LLStringUtil::endsWith(boost::to_lower_copy(channel), " edu")) // Release Notes url shouldn't include the EDU parameter - { - boost::erase_tail(channel, 4); - } - url += LLURI::escape(channel) + "/"; - url += LLURI::escape(LLVersionInfo::getVersion()); + url += LLURI::escape(LLVersionInfo::getVersion()) + ".html"; info["VIEWER_RELEASE_NOTES_URL"] = url; diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index 74d160dfae..eee3dc2c77 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -432,7 +432,7 @@ Prøv venligst om lidt igen. Noter om version - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ Henter... diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index 6e980d1609..95eb88614b 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -648,7 +648,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden. Versionshinweise - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ Wird geladen... diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4dbafd27e0..1c5e51d2c8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -324,7 +324,7 @@ Please try logging in again in a minute. Release Notes - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ Loading... diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 68cd72802d..1b06675670 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -640,7 +640,7 @@ Intenta iniciar sesión de nuevo en unos instantes. Notas de la versión - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ Cargando... diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 9cd5770108..dbd5cc3bf4 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -649,7 +649,7 @@ Veuillez réessayer de vous connecter dans une minute. Notes de version - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ Chargement... diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 0ea6bd5d22..9492d062c3 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -645,7 +645,7 @@ Prova ad accedere nuovamente tra un minuto. Note sulla versione - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ In caricamento... diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 497ea649d1..91d31faa76 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -648,7 +648,7 @@ support@secondlife.com にお問い合わせください。 リリースノート - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ ローディング... diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 3075113480..c4fbf1f4c9 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -605,7 +605,7 @@ Aguarde um minuto antes que tentar logar-se novamente. Notas de versão - http://wiki.secondlife.com/wiki/Release_Notes/ + https://releasenotes.secondlife.com/viewer/ Carregando... -- cgit v1.2.3 From 02ab47b256444d6e8a980c4456c73a659c846c49 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 21 May 2019 08:57:32 -0400 Subject: Added tag 6.2.2-release for changeset ec09daf1899c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 96ea267be3..d440a39e8e 100755 --- a/.hgtags +++ b/.hgtags @@ -548,3 +548,4 @@ a3143db58a0f6b005232bf9018e7fef17ff9ec90 6.1.0-release 50f0ece62ddb5a244ecb6d00ef5a89d80ad50efa 6.1.1-release 82a89165e5929a6c3073d6cd60a543cb395f147b 6.2.0-release 706bdc7e25c6e6b8fb56f4a13fcce2936e70a79c 6.2.1-release +ec09daf1899c1c01c4ba0ba950fae572f2a612a8 6.2.2-release -- cgit v1.2.3 From 2672194b1d3eb03648861a29e57d81a38f527746 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 21 May 2019 08:57:32 -0400 Subject: increment viewer version to 6.2.3 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index ca06394388..bee9433817 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.2.2 +6.2.3 -- cgit v1.2.3