diff options
| author | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
| commit | 189599b6ff0c4e6b81e761fbc990c057189359f2 (patch) | |
| tree | 1e9e0e91bae9bb1ee53e57ac91cdbbfc9f6dba95 /indra/newview/llinventorybridge.h | |
| parent | fd46865a502036b9e4414e7ec4950faf551b1f14 (diff) | |
Merging from server/server-1.25 back to trunk.
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index d038c10c73..5df3ba23af 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -159,6 +159,7 @@ public: virtual const std::string& getPrefix() { return LLStringUtil::null; } virtual void restoreItem() {} + virtual void restoreToWorld() {} // LLFolderViewEventListener functions virtual const std::string& getName() const; @@ -234,6 +235,7 @@ public: virtual void selectItem(); virtual void restoreItem(); + virtual void restoreToWorld(); virtual LLUIImagePtr getIcon() const; virtual const std::string& getDisplayName() const; @@ -274,7 +276,6 @@ public: virtual void selectItem(); virtual void restoreItem(); - virtual LLUIImagePtr getIcon() const; virtual BOOL renameItem(const std::string& new_name); virtual BOOL removeItem(); |