diff options
Diffstat (limited to 'indra/newview/llpreviewgesture.cpp')
| -rw-r--r-- | indra/newview/llpreviewgesture.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index 04827e3a78..32ed20bd56 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -32,10 +32,10 @@ #include "llviewerprecompiledheaders.h" -#include <algorithm> - #include "llpreviewgesture.h" +#include <algorithm> + // libraries #include "lldatapacker.h" #include "lldarray.h" @@ -260,7 +260,8 @@ BOOL LLPreviewGesture::canClose() } } -void LLPreviewGesture::onClose() +// virtual +void LLPreviewGesture::onClose(bool app_quitting) { LLGestureManager::instance().stopGesture(mPreviewGesture); } @@ -354,7 +355,6 @@ LLPreviewGesture::~LLPreviewGesture() BOOL LLPreviewGesture::postBuild() { - mCloseSignal.connect(boost::bind(&LLPreviewGesture::onClose, this)); mVisibleSignal.connect(boost::bind(&LLPreviewGesture::onVisibilityChange, this, _2)); LLLineEditor* edit; @@ -421,9 +421,7 @@ BOOL LLPreviewGesture::postBuild() mStepList = list; // Options - text = getChild<LLTextBox>("options_text"); - text->setBorderVisible(TRUE); - mOptionsText = text; + mOptionsText = getChild<LLTextBox>("options_text"); combo = getChild<LLComboBox>( "animation_list"); combo->setVisible(FALSE); |