summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterproperties.cpp
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2010-02-11 23:34:20 +0800
committerangela <angela@lindenlab.com>2010-02-11 23:34:20 +0800
commitf078c53da8ee11b7bb383c0974875b5ff4a15c6a (patch)
treef8fd975ace547f1e3c194cfa3446f1ef35b2d12b /indra/newview/llfloaterproperties.cpp
parent3684b437a0e1c4c8be6d05e3a5f131265b8f1a39 (diff)
parent5e12a2cb697ad1d82a472cc35fc3570209e5ec0e (diff)
merge with remote repo
Diffstat (limited to 'indra/newview/llfloaterproperties.cpp')
-rw-r--r--indra/newview/llfloaterproperties.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index bde86a4034..5c0593ad29 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -880,7 +880,11 @@ void LLFloaterProperties::dirtyAll()
iter != inst_list.end(); ++iter)
{
LLFloaterProperties* floater = dynamic_cast<LLFloaterProperties*>(*iter);
- floater->dirty();
+ llassert(floater); // else cast failed - wrong type D:
+ if (floater)
+ {
+ floater->dirty();
+ }
}
}