diff options
Diffstat (limited to 'linden/indra/newview/llinventorybridge.h')
-rw-r--r-- | linden/indra/newview/llinventorybridge.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h index 4b20dcf..b076f77 100644 --- a/linden/indra/newview/llinventorybridge.h +++ b/linden/indra/newview/llinventorybridge.h | |||
@@ -159,6 +159,7 @@ public: | |||
159 | 159 | ||
160 | virtual const std::string& getPrefix() { return LLStringUtil::null; } | 160 | virtual const std::string& getPrefix() { return LLStringUtil::null; } |
161 | virtual void restoreItem() {} | 161 | virtual void restoreItem() {} |
162 | virtual void restoreToWorld() {} | ||
162 | 163 | ||
163 | // LLFolderViewEventListener functions | 164 | // LLFolderViewEventListener functions |
164 | virtual const std::string& getName() const; | 165 | virtual const std::string& getName() const; |
@@ -192,7 +193,15 @@ public: | |||
192 | virtual BOOL dragOrDrop(MASK mask, BOOL drop, | 193 | virtual BOOL dragOrDrop(MASK mask, BOOL drop, |
193 | EDragAndDropType cargo_type, | 194 | EDragAndDropType cargo_type, |
194 | void* cargo_data) { return FALSE; } | 195 | void* cargo_data) { return FALSE; } |
195 | virtual LLInventoryType::EType getInventoryType() const { return mInvType; } | 196 | |
197 | virtual LLInventoryType::EType getInventoryType() const | ||
198 | { | ||
199 | return mInvType; | ||
200 | } | ||
201 | virtual LLInventoryType::NType getNInventoryType() const | ||
202 | { | ||
203 | return mNInvType; | ||
204 | } | ||
196 | 205 | ||
197 | // LLInvFVBridge functionality | 206 | // LLInvFVBridge functionality |
198 | virtual void clearDisplayName() {} | 207 | virtual void clearDisplayName() {} |
@@ -221,6 +230,7 @@ protected: | |||
221 | LLInventoryPanel* mInventoryPanel; | 230 | LLInventoryPanel* mInventoryPanel; |
222 | LLUUID mUUID; // item id | 231 | LLUUID mUUID; // item id |
223 | LLInventoryType::EType mInvType; | 232 | LLInventoryType::EType mInvType; |
233 | LLInventoryType::NType mNInvType; | ||
224 | }; | 234 | }; |
225 | 235 | ||
226 | 236 | ||
@@ -234,6 +244,7 @@ public: | |||
234 | 244 | ||
235 | virtual void selectItem(); | 245 | virtual void selectItem(); |
236 | virtual void restoreItem(); | 246 | virtual void restoreItem(); |
247 | virtual void restoreToWorld(); | ||
237 | 248 | ||
238 | virtual LLUIImagePtr getIcon() const; | 249 | virtual LLUIImagePtr getIcon() const; |
239 | virtual const std::string& getDisplayName() const; | 250 | virtual const std::string& getDisplayName() const; |
@@ -274,7 +285,6 @@ public: | |||
274 | virtual void selectItem(); | 285 | virtual void selectItem(); |
275 | virtual void restoreItem(); | 286 | virtual void restoreItem(); |
276 | 287 | ||
277 | |||
278 | virtual LLUIImagePtr getIcon() const; | 288 | virtual LLUIImagePtr getIcon() const; |
279 | virtual BOOL renameItem(const std::string& new_name); | 289 | virtual BOOL renameItem(const std::string& new_name); |
280 | virtual BOOL removeItem(); | 290 | virtual BOOL removeItem(); |