Skip to content
Snippets Groups Projects
Commit 40197ed6 authored by Denis Serdjuk's avatar Denis Serdjuk
Browse files

fixed Bug EXT-2058 Viewer crash after disconecting when Panel Place Profile is opened

Cause:
idle callback was called after viewer had been disconnected and agent's region object was NOT available.

--HG--
branch : product-engine
parent 6bb24921
Branches
Tags
No related merge requests found
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include "llaccordionctrltab.h" #include "llaccordionctrltab.h"
#include "llagent.h" #include "llagent.h"
#include "llagentui.h" #include "llagentui.h"
#include "llappviewer.h"
#include "llavatarpropertiesprocessor.h" #include "llavatarpropertiesprocessor.h"
#include "llcallbacklist.h" #include "llcallbacklist.h"
#include "llexpandabletextbox.h" #include "llexpandabletextbox.h"
...@@ -1003,14 +1004,16 @@ void LLPanelPlaceInfo::updateYouAreHereBanner(void* userdata) ...@@ -1003,14 +1004,16 @@ void LLPanelPlaceInfo::updateYouAreHereBanner(void* userdata)
LLPanelPlaceInfo* self = static_cast<LLPanelPlaceInfo*>(userdata); LLPanelPlaceInfo* self = static_cast<LLPanelPlaceInfo*>(userdata);
if(!self->getVisible()) if(!self->getVisible())
return; return;
if(!gDisconnected)
{
static F32 radius = gSavedSettings.getF32("YouAreHereDistance"); static F32 radius = gSavedSettings.getF32("YouAreHereDistance");
BOOL display_banner = self->mLastSelectedRegionID == gAgent.getRegion()->getRegionID() && BOOL display_banner = gAgent.getRegion()->getRegionID() == self->mLastSelectedRegionID &&
LLAgentUI::checkAgentDistance(self->mPosRegion, radius); LLAgentUI::checkAgentDistance(self->mPosRegion, radius);
self->mYouAreHerePanel->setVisible(display_banner); self->mYouAreHerePanel->setVisible(display_banner);
} }
}
void LLPanelPlaceInfo::onForSaleBannerClick() void LLPanelPlaceInfo::onForSaleBannerClick()
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment