Commit 01c7e6bb authored by Anchor's avatar Anchor
Browse files

Merge

parents 504a138c 2672194b
......@@ -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
......@@ -582,11 +582,12 @@ class LL_COMMON_API LLEventPump: public LLEventTrackable
/// 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,12 +676,14 @@ class LL_COMMON_API LLEventMailDrop : public LLEventStream
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,
const NameList& before);
const NameList& before) override;
private:
typedef std::list<LLSD> EventList;
......@@ -703,7 +706,6 @@ class LL_COMMON_API LLEventQueue: public LLEventPump
/// Post an event to all listeners
virtual bool post(const LLSD& event);
private:
/// flush queued events
virtual void flush();
......
......@@ -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)
......
......@@ -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())
{
......
......@@ -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;
......
......@@ -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;
......
......@@ -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.
......
......@@ -432,7 +432,7 @@ Prøv venligst om lidt igen.
Noter om version
</string>
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
<string name="LoadingData">
Henter...
......
......@@ -648,7 +648,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
Versionshinweise
</string>
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
<string name="LoadingData">
Wird geladen...
......
......@@ -324,7 +324,7 @@ Please try logging in again in a minute.</string>
<string name="ReleaseNotes">Release Notes</string>
<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
<string name="RELEASE_NOTES_BASE_URL" translate="false">http://wiki.secondlife.com/wiki/Release_Notes/</string>
<string name="RELEASE_NOTES_BASE_URL" translate="false">https://releasenotes.secondlife.com/viewer/</string>
<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
<string name="LoadingData">Loading...</string>
......
......@@ -640,7 +640,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
Notas de la versión
</string>
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
<string name="LoadingData">
Cargando...
......
......@@ -649,7 +649,7 @@ Veuillez réessayer de vous connecter dans une minute.
Notes de version
</string>
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
<string name="LoadingData">
Chargement...
......
......@@ -645,7 +645,7 @@ Prova ad accedere nuovamente tra un minuto.
Note sulla versione
</string>
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
<string name="LoadingData">
In caricamento...
......
......@@ -648,7 +648,7 @@ support@secondlife.com にお問い合わせください。
リリースノート
</string>
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
<string name="LoadingData">
ローディング...
......
......@@ -605,7 +605,7 @@ Aguarde um minuto antes que tentar logar-se novamente.
Notas de versão
</string>
<string name="RELEASE_NOTES_BASE_URL">
http://wiki.secondlife.com/wiki/Release_Notes/
https://releasenotes.secondlife.com/viewer/
</string>
<string name="LoadingData">
Carregando...
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment