diff options
| author | callum_linden <none@none> | 2016-05-06 13:40:29 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-06 13:40:29 -0700 |
| commit | c5d6bfe8ae61e3311c260626b590586d3cde4b6e (patch) | |
| tree | 4b731e4be618f6b9048bcc7e6dadf663f0baec49 /indra/newview/llpanelgroupexperiences.cpp | |
| parent | 811a0b5726ed965f9f21ace2d3ec97bb95a91311 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/newview/llpanelgroupexperiences.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupexperiences.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupexperiences.cpp b/indra/newview/llpanelgroupexperiences.cpp index a88a55ab22..6c40499208 100644 --- a/indra/newview/llpanelgroupexperiences.cpp +++ b/indra/newview/llpanelgroupexperiences.cpp @@ -30,7 +30,7 @@ #include "lluictrlfactory.h" #include "roles_constants.h" - +#include "llappviewer.h" #include "llagent.h" #include "llviewerregion.h" #include "llflatlistview.h" @@ -67,7 +67,7 @@ BOOL LLPanelGroupExperiences::postBuild() void LLPanelGroupExperiences::activate() { - if (getGroupID() == LLUUID::null) + if ((getGroupID() == LLUUID::null) || gDisconnected) { return; } |