diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index 9c3d07a45..6b0f52bab 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -374,10 +374,6 @@ LLPreviewGesture::LLPreviewGesture() mSoundCombo(NULL), mChatEditor(NULL), mSaveBtn(NULL), - // - mDuplicateBtn(NULL), - mOpenBtn(NULL), - // mPreviewBtn(NULL), mPreviewGesture(NULL), mDirty(FALSE) @@ -739,8 +735,6 @@ void LLPreviewGesture::refresh() mActiveCheck->setEnabled(FALSE); mSaveBtn->setEnabled(FALSE); // - mDuplicateBtn->setEnabled(TRUE); - mOpenBtn->setEnabled(TRUE); mStepList->setEnabled(TRUE); // @@ -749,11 +743,7 @@ void LLPreviewGesture::refresh() return; } - // - //BOOL modifiable = item->getPermissions().allowModifyBy(gAgent.getID()); - BOOL modifiable = TRUE; - mOpenBtn->setEnabled(TRUE); - // + BOOL modifiable = item->getPermissions().allowModifyBy(gAgent.getID()); childSetEnabled("desc", modifiable); mTriggerEditor->setEnabled(TRUE); @@ -802,9 +792,6 @@ void LLPreviewGesture::refresh() mWaitAnimCheck->setVisible(FALSE); mWaitTimeCheck->setVisible(FALSE); mWaitTimeEditor->setVisible(FALSE); - // - mOpenBtn->setVisible(FALSE); - // std::string optionstext; @@ -824,9 +811,6 @@ void LLPreviewGesture::refresh() mAnimationRadio->setVisible(TRUE); mAnimationRadio->setSelectedIndex((anim_step->mFlags & ANIM_FLAG_STOP) ? 1 : 0); mAnimationCombo->setCurrentByID(anim_step->mAnimAssetID); - // - mOpenBtn->setVisible(TRUE); - // break; } case STEP_SOUND: @@ -835,9 +819,6 @@ void LLPreviewGesture::refresh() optionstext = getString("step_sound"); mSoundCombo->setVisible(TRUE); mSoundCombo->setCurrentByID(sound_step->mSoundAssetID); - // - mOpenBtn->setVisible(TRUE); - // break; } case STEP_CHAT: diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h index d7d297c6a..8c62b9b4a 100644 --- a/indra/newview/llpreviewgesture.h +++ b/indra/newview/llpreviewgesture.h @@ -99,22 +99,22 @@ protected: void saveIfNeeded(); - // - void saveDuplicate(); - class GestureItemForDuplicateCallback : public LLInventoryCallback - { - void fire(const LLUUID& inv_item); - }; + // + void saveDuplicate(); + class GestureItemForDuplicateCallback : public LLInventoryCallback + { + void fire(const LLUUID& inv_item); + }; // static void onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status); - // - static void onSaveDuplicateComplete(const LLUUID& asset_uuid, - void* user_data, - S32 status, LLExtStat ext_status); + // + static void onSaveDuplicateComplete(const LLUUID& asset_uuid, + void* user_data, + S32 status, LLExtStat ext_status); // bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response); @@ -149,10 +149,10 @@ protected: static void onCommitActive(LLUICtrl* ctrl, void* data); static void onClickSave(void* data); - // - static void onClickDuplicate(void* data); - static void onClickOpen(void* data); - virtual LLUUID getItemID(); + // + static void onClickDuplicate(void* data); + static void onClickOpen(void* data); + virtual LLUUID getItemID(); // static void onClickPreview(void* data); @@ -160,9 +160,9 @@ protected: virtual const char *getTitleName() const { return "Gesture"; } - // - virtual BOOL canSaveAs() const; - virtual void saveAs(); + // + virtual BOOL canSaveAs() const; + virtual void saveAs(); // protected: @@ -192,10 +192,7 @@ protected: LLCheckBoxCtrl* mActiveCheck; LLButton* mSaveBtn; - // - LLButton* mDuplicateBtn; - LLButton* mOpenBtn; - // + LLButton* mPreviewBtn; LLMultiGesture* mPreviewGesture;