diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 18:28:19 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 18:28:19 -0800 |
commit | a9867b6437efd07ef9b18315d61155bd10860e13 (patch) | |
tree | d059f1d6a6809acbedd5ba2ea72c4f88acee2b1b /indra/newview/llfloaterregioninfo.cpp | |
parent | 6bb43e1369d957a041c796120e87a89ff3fa10ee (diff) | |
parent | 8a2404fa3341db0bd7a60459e008b8a3c6afad03 (diff) |
Automated merge
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
-rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 1bed47e7e1..023559de44 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -406,6 +406,11 @@ LLPanelEstateCovenant* LLFloaterRegionInfo::getPanelCovenant() void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region) { + if (!region) + { + return; + } + // call refresh from region on all panels std::for_each( mInfoPanels.begin(), |