summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-12-03 11:37:51 -0800
committerRick Pasetto <rick@lindenlab.com>2009-12-03 11:37:51 -0800
commit8752f020fc4dc3e605e361f824fcfd4eae4b2ab0 (patch)
treead5b0c8c62009ed633a33ccb58dfe85bdf7a2894
parent42fbb0abcd6bd6913ba69512681dbc6ddc7554a3 (diff)
Don't show controls if build tools are up
-rw-r--r--indra/newview/llpanelprimmediacontrols.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 7efda89850..aa2b7d4554 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -64,6 +64,8 @@
#include "llweb.h"
#include "llwindow.h"
+#include "llfloatertools.h" // to enable hide if build tools are up
+
glh::matrix4f glh_get_current_modelview();
glh::matrix4f glh_get_current_projection();
@@ -273,7 +275,7 @@ void LLPanelPrimMediaControls::updateShape()
LLViewerMediaImpl* media_impl = getTargetMediaImpl();
LLViewerObject* objectp = getTargetObject();
- if(!media_impl)
+ if(!media_impl || gFloaterTools->getVisible())
{
setVisible(FALSE);
return;