diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-18 14:51:26 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-18 14:51:26 +0200 |
commit | 97f35b18f08a80ca03437593b9e092ce34a7e6bb (patch) | |
tree | b15ebbe9253899e668fbe3c255f54d26b899012d /indra/newview/llpanelvolume.cpp | |
parent | 5c4ab75cdab1b9de08d482457f9d245dd18b90da (diff) | |
parent | a3ca39a437b645be986b9a1fa65821d971d26bcc (diff) |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
-rw-r--r-- | indra/newview/llpanelvolume.cpp | 4 |
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) { |