summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelvolume.cpp
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-15 11:24:33 -0800
committerrichard <none@none>2010-01-15 11:24:33 -0800
commit1d1f51db971271c42d68fa12032d6f85a7e35bd8 (patch)
tree0f2aaa0f64a7b53fc89c1de76b59d996d0a1ecc0 /indra/newview/llpanelvolume.cpp
parent61e243ad060064e6b6899478e5247ecd7871f8a5 (diff)
parent109b79e9ad67b5fa8967442a47ef15e456eb5bff (diff)
merge
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
-rw-r--r--indra/newview/llpanelvolume.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 5a70842a73..fbe68b4d92 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -54,7 +54,7 @@
#include "llcolorswatch.h"
#include "lltexturectrl.h"
#include "llcombobox.h"
-#include "llfirstuse.h"
+//#include "llfirstuse.h"
#include "llfocusmgr.h"
#include "llmanipscale.h"
#include "llpreviewscript.h"
@@ -470,7 +470,7 @@ void LLPanelVolume::sendIsFlexible()
if (is_flexible)
{
- LLFirstUse::useFlexible();
+ //LLFirstUse::useFlexible();
if (objectp->getClickAction() == CLICK_ACTION_SIT)
{