CHUI-101 WIP Make LLFolderview general purpose

inventory item labels and icons displaying again

1 files changed, 1 insertions, 16 deletions

diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index d66362d544..3cf03c3bc5 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -60,9 +60,6 @@ public:
 	virtual const LLUUID& getAssetUUID() const;
 	virtual const LLUUID& getProtectedAssetUUID() const; // returns LLUUID::null if current agent does not have permission to expose this asset's UUID to the user
 	virtual const std::string& getName() const;
-	virtual S32 getSortField() const;
-	virtual void setSortField(S32 sortField);
-	virtual void getSLURL(); //Caches SLURL for landmark. //*TODO: Find a better way to do it and remove this method from here.
 	virtual const bool getIsFullPerm() const; // 'fullperm' in the popular sense: modify-ok & copy-ok & transfer-ok, no special god rules applied
 	virtual const LLUUID& getCreatorUUID() const;
 	virtual const std::string& getDescription() const;
@@ -72,7 +69,7 @@ public:
 	virtual LLWearableType::EType getWearableType() const;
 	virtual U32 getFlags() const;
 
-        using LLInventoryItem::getPermissions;
+    using LLInventoryItem::getPermissions;
 	using LLInventoryItem::getCreationDate;
 	using LLInventoryItem::setCreationDate;
 	using LLInventoryItem::getCRC32;
@@ -287,18 +284,6 @@ public:
 	void fire(const LLUUID& inv_item);
 };
 
-class AddFavoriteLandmarkCallback : public LLInventoryCallback
-{
-public:
-	AddFavoriteLandmarkCallback() : mTargetLandmarkId(LLUUID::null) {}
-	void setTargetLandmarkId(const LLUUID& target_uuid) { mTargetLandmarkId = target_uuid; }
-
-private:
-	void fire(const LLUUID& inv_item);
-
-	LLUUID mTargetLandmarkId;
-};
-
 // misc functions
 //void inventory_reliable_callback(void**, S32 status);