diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/llfloaterbump.cpp | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/llfloaterbump.cpp')
| -rw-r--r-- | indra/newview/llfloaterbump.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp index e4e1c7efa2..8b64f913e0 100644 --- a/indra/newview/llfloaterbump.cpp +++ b/indra/newview/llfloaterbump.cpp @@ -45,11 +45,13 @@ ///---------------------------------------------------------------------------- /// Class LLFloaterBump ///---------------------------------------------------------------------------- +extern BOOL gNoRender; // Default constructor LLFloaterBump::LLFloaterBump(const LLSD& key) -: LLFloater() +: LLFloater(key) { + if(gNoRender) return; //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_bumps.xml"); } |