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

39
indra/newview/llpreviewgesture.h
View File

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