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

Double check vmm merge against alchemy. (sync)

Browse Source
This commit is contained in:
Inusaito Sayori
2015-08-01 16:55:33 -04:00
committed by Lirusaito
parent fd4155f4b6
commit 7c1af50bda
17 changed files with 472 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpanelobjectinventory.h
View File

@@ -52,6 +52,7 @@ public:
void refresh();
const LLUUID& getTaskUUID() { return mTaskUUID;}
void clearInventoryTask();
void removeSelectedItem();
void startRenamingSelectedItem();
@@ -77,7 +78,6 @@ protected:
void createViewsForCategory(LLInventoryObject::object_list_t* inventory,
LLInventoryObject* parent,
LLFolderViewFolder* folder);
void clearContents();
private: