summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-10-07 16:12:56 -0700
committerbrad kittenbrink <brad@lindenlab.com>2009-10-07 16:12:56 -0700
commit146e084af3344ada737340115c5fa063c0aab6b3 (patch)
tree19e0115569a06f9ec27bd7c482a1066c99afb501 /indra/newview/llpanelface.cpp
parentd2464757c6fa86caa30a13071cb43047de2dd2ff (diff)
parent584d0ac64e973da3a9096fb85b796716255988be (diff)
Merged in latest svn-imports-viewer-20 changes.
Diffstat (limited to 'indra/newview/llpanelface.cpp')
-rw-r--r--indra/newview/llpanelface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index c61b987b1c..ee0426c7df 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -786,8 +786,8 @@ void LLPanelFace::getState()
childSetEnabled("button align",FALSE);
childSetEnabled("button apply",FALSE);
- childSetEnabled("has media", FALSE);
- childSetEnabled("media info set", FALSE);
+ //childSetEnabled("has media", FALSE);
+ //childSetEnabled("media info set", FALSE);
}
}