diff options
| author | prep@lindenlab.com <prep@lindenlab.com> | 2013-04-26 14:34:37 -0500 |
|---|---|---|
| committer | prep@lindenlab.com <prep@lindenlab.com> | 2013-04-26 14:34:37 -0500 |
| commit | 2992e3b6201da1655f7ae186782db6d11aee82b8 (patch) | |
| tree | 72ffa47c2604683d49812dd276f4c17458974e74 /indra/llinventory | |
| parent | 2c617e0beb145f3c8451ffdc8445e97358a17427 (diff) | |
| parent | fb51bab6cd2e3f037142ce7c5f547113d76f0504 (diff) | |
merge
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 7 | ||||
| -rw-r--r-- | indra/llinventory/llinventory.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 41d58c6deb..a4cd8333cf 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -249,13 +249,6 @@ BOOL LLInventoryObject::exportLegacyStream(std::ostream& output_stream, BOOL) co return TRUE; } - -void LLInventoryObject::removeFromServer() -{ - // don't do nothin' - llwarns << "LLInventoryObject::removeFromServer() called. Doesn't do anything." << llendl; -} - void LLInventoryObject::updateParentOnServer(BOOL) const { // don't do nothin' diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 99716ed7be..8b865f044d 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -101,7 +101,6 @@ public: virtual BOOL importLegacyStream(std::istream& input_stream); virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; - virtual void removeFromServer(); virtual void updateParentOnServer(BOOL) const; virtual void updateServer(BOOL) const; |