Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for people reporting crashes when attempting to open the gesture editor.

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-14 22:46:38 -04:00
parent e58c6c1f39
commit c6b1ba3b84
2 changed files with 19 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llpreviewgesture.cpp
View File

@@ -374,10 +374,6 @@ LLPreviewGesture::LLPreviewGesture()
mSoundCombo(NULL), mSoundCombo(NULL),
mChatEditor(NULL), mChatEditor(NULL),
mSaveBtn(NULL), mSaveBtn(NULL),
// <edit>
mDuplicateBtn(NULL),
mOpenBtn(NULL),
// </edit>
mPreviewBtn(NULL), mPreviewBtn(NULL),
mPreviewGesture(NULL), mPreviewGesture(NULL),
mDirty(FALSE) mDirty(FALSE)
@@ -739,8 +735,6 @@ void LLPreviewGesture::refresh()
mActiveCheck->setEnabled(FALSE); mActiveCheck->setEnabled(FALSE);
mSaveBtn->setEnabled(FALSE); mSaveBtn->setEnabled(FALSE);
// <edit> // <edit>
mDuplicateBtn->setEnabled(TRUE);
mOpenBtn->setEnabled(TRUE);
mStepList->setEnabled(TRUE); mStepList->setEnabled(TRUE);
// </edit> // </edit>
@@ -749,11 +743,7 @@ void LLPreviewGesture::refresh()
return; return;
} }
// <edit> BOOL modifiable = item->getPermissions().allowModifyBy(gAgent.getID());
//BOOL modifiable = item->getPermissions().allowModifyBy(gAgent.getID());
BOOL modifiable = TRUE;
mOpenBtn->setEnabled(TRUE);
// </edit>
childSetEnabled("desc", modifiable); childSetEnabled("desc", modifiable);
mTriggerEditor->setEnabled(TRUE); mTriggerEditor->setEnabled(TRUE);
@@ -802,9 +792,6 @@ void LLPreviewGesture::refresh()
mWaitAnimCheck->setVisible(FALSE); mWaitAnimCheck->setVisible(FALSE);
mWaitTimeCheck->setVisible(FALSE); mWaitTimeCheck->setVisible(FALSE);
mWaitTimeEditor->setVisible(FALSE); mWaitTimeEditor->setVisible(FALSE);
// <edit>
mOpenBtn->setVisible(FALSE);
// </edit>
std::string optionstext; std::string optionstext;
@@ -824,9 +811,6 @@ void LLPreviewGesture::refresh()
mAnimationRadio->setVisible(TRUE); mAnimationRadio->setVisible(TRUE);
mAnimationRadio->setSelectedIndex((anim_step->mFlags & ANIM_FLAG_STOP) ? 1 : 0); mAnimationRadio->setSelectedIndex((anim_step->mFlags & ANIM_FLAG_STOP) ? 1 : 0);
mAnimationCombo->setCurrentByID(anim_step->mAnimAssetID); mAnimationCombo->setCurrentByID(anim_step->mAnimAssetID);
// <edit>
mOpenBtn->setVisible(TRUE);
// </edit>
break; break;
} }
case STEP_SOUND: case STEP_SOUND:
@@ -835,9 +819,6 @@ void LLPreviewGesture::refresh()
optionstext = getString("step_sound"); optionstext = getString("step_sound");
mSoundCombo->setVisible(TRUE); mSoundCombo->setVisible(TRUE);
mSoundCombo->setCurrentByID(sound_step->mSoundAssetID); mSoundCombo->setCurrentByID(sound_step->mSoundAssetID);
// <edit>
mOpenBtn->setVisible(TRUE);
// </edit>
break; break;
} }
case STEP_CHAT: case STEP_CHAT:

39
indra/newview/llpreviewgesture.h
View File

@@ -99,22 +99,22 @@ protected:
void saveIfNeeded(); void saveIfNeeded();
// <edit> // <edit>
void saveDuplicate(); void saveDuplicate();
class GestureItemForDuplicateCallback : public LLInventoryCallback class GestureItemForDuplicateCallback : public LLInventoryCallback
{ {
void fire(const LLUUID& inv_item); void fire(const LLUUID& inv_item);
}; };
// </edit> // </edit>
static void onSaveComplete(const LLUUID& asset_uuid, static void onSaveComplete(const LLUUID& asset_uuid,
void* user_data, void* user_data,
S32 status, LLExtStat ext_status); S32 status, LLExtStat ext_status);
// <edit> // <edit>
static void onSaveDuplicateComplete(const LLUUID& asset_uuid, static void onSaveDuplicateComplete(const LLUUID& asset_uuid,
void* user_data, void* user_data,
S32 status, LLExtStat ext_status); S32 status, LLExtStat ext_status);
// </edit> // </edit>
bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response); bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response);
@@ -149,10 +149,10 @@ protected:
static void onCommitActive(LLUICtrl* ctrl, void* data); static void onCommitActive(LLUICtrl* ctrl, void* data);
static void onClickSave(void* data); static void onClickSave(void* data);
// <edit> // <edit>
static void onClickDuplicate(void* data); static void onClickDuplicate(void* data);
static void onClickOpen(void* data); static void onClickOpen(void* data);
virtual LLUUID getItemID(); virtual LLUUID getItemID();
// </edit> // </edit>
static void onClickPreview(void* data); static void onClickPreview(void* data);
@@ -160,9 +160,9 @@ protected:
virtual const char *getTitleName() const { return "Gesture"; } virtual const char *getTitleName() const { return "Gesture"; }
// <edit> // <edit>
virtual BOOL canSaveAs() const; virtual BOOL canSaveAs() const;
virtual void saveAs(); virtual void saveAs();
// </edit> // </edit>
protected: protected:
@@ -192,10 +192,7 @@ protected:
LLCheckBoxCtrl* mActiveCheck; LLCheckBoxCtrl* mActiveCheck;
LLButton* mSaveBtn; LLButton* mSaveBtn;
// <edit>
LLButton* mDuplicateBtn;
LLButton* mOpenBtn;
// </edit>
LLButton* mPreviewBtn; LLButton* mPreviewBtn;
LLMultiGesture* mPreviewGesture; LLMultiGesture* mPreviewGesture;