diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llcoros.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/lleventcoro.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/lualistener.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 7 | ||||
| -rwxr-xr-x | indra/newview/llviewerparceloverlay.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 2 |
6 files changed, 7 insertions, 12 deletions
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp index 5a3cbd2ef1..d188520652 100644 --- a/indra/llcommon/llcoros.cpp +++ b/indra/llcommon/llcoros.cpp @@ -472,7 +472,7 @@ LLBoundListener LLCoros::getStopListener(const std::string& caller, // This overload responds to viewer shutdown and to killreq(consumer). return LLEventPumps::instance().obtain("LLCoros") .listen( - LLEventPump::inventName(caller), + caller, [consumer, cleanup](const LLSD& event) { auto status{ event["status"].asString() }; diff --git a/indra/llcommon/lleventcoro.cpp b/indra/llcommon/lleventcoro.cpp index 33db27a116..2ad0aa5eff 100644 --- a/indra/llcommon/lleventcoro.cpp +++ b/indra/llcommon/lleventcoro.cpp @@ -168,7 +168,7 @@ postAndSuspendSetup(const std::string& callerName, // notice the pending LLApp status first. LLBoundListener stopper( LLCoros::getStopListener( - listenerName, + LLEventPump::ANONYMOUS, LLCoros::instance().getName(), [&promise, listenerName](const LLSD& status) { diff --git a/indra/llcommon/lualistener.cpp b/indra/llcommon/lualistener.cpp index 94085c6798..188445a460 100644 --- a/indra/llcommon/lualistener.cpp +++ b/indra/llcommon/lualistener.cpp @@ -40,7 +40,7 @@ LuaListener::LuaListener(lua_State* L): // Listen for shutdown events. mShutdownConnection( LLCoros::getStopListener( - "LuaState", + LLEventPump::ANONYMOUS, mCoroName, [this](const LLSD&) { diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 68c38c3692..0b7d1a7e35 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6722,11 +6722,8 @@ class LLAvatarEnableResetSkeleton : public view_listener_t { bool handleEvent(const LLSD& userdata) { - if (LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject())) - { - return true; - } - return false; + LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(); + return obj && obj->getAvatar(); } }; diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp index 019e870829..5b26f9f031 100755 --- a/indra/newview/llviewerparceloverlay.cpp +++ b/indra/newview/llviewerparceloverlay.cpp @@ -559,8 +559,7 @@ void LLViewerParcelOverlay::addPropertyLine(F32 start_x, F32 start_y, F32 dx, F3 { F32 new_x = start[VX] + (x - start[VX]) * part; F32 new_y = start[VY] + (y - start[VY]) * part; - F32 new_z = start[VZ] + (z - start[VZ]) * part; - edge.pushVertex(lod, new_x, new_y, new_z, water_z); + edge.pushVertex(lod, new_x, new_y, water_z, 0); }; auto checkForSplit = [&](U32 lod) @@ -624,7 +623,6 @@ void LLViewerParcelOverlay::addPropertyLine(F32 start_x, F32 start_y, F32 dx, F3 // Point G simplified (last two vertices) move(LINE_WIDTH); - checkForSplit(1); pushTwoVertices(1); // Point G detailized (only one vertex) diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index 66fa3d6921..c7e246b3bf 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -303,7 +303,7 @@ void LLWebRTCVoiceClient::stopTimer() { if (mIsTimerActive) { - LLMuteList::instanceExists(); + if (LLMuteList::instanceExists()) { LLMuteList::getInstance()->removeObserver(this); } |