aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:07 -0500
committerJacek Antonelli2008-08-15 23:45:07 -0500
commit8465910c79b8e746e04fd581cca2d60399e569b9 (patch)
treef43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/llui/llfloater.cpp
parentSecond Life viewer sources 1.18.2.1 (diff)
downloadmeta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2
meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llfloater.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index b45661f..77fddfb 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -1252,10 +1252,13 @@ BOOL LLFloater::getEditModeEnabled()
1252//static 1252//static
1253void LLFloater::show(LLFloater* floaterp) 1253void LLFloater::show(LLFloater* floaterp)
1254{ 1254{
1255 if (floaterp) floaterp->open(); 1255 if (floaterp)
1256 if (floaterp->getHost())
1257 { 1256 {
1258 floaterp->getHost()->open(); 1257 floaterp->open();
1258 if (floaterp->getHost())
1259 {
1260 floaterp->getHost()->open();
1261 }
1259 } 1262 }
1260} 1263}
1261 1264