summaryrefslogtreecommitdiff
path: root/indra/llinventory/llparcel.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-01 22:07:12 -0400
committerOz Linden <oz@lindenlab.com>2011-06-01 22:07:12 -0400
commit8bfd3201de0d135ef984dc270e83ea88d8f03dd6 (patch)
tree040272fc843ed2b00c9b9b162dad9fa503ef078a /indra/llinventory/llparcel.cpp
parent68088a27ba92d8a3ce84ee6e5691e9e2e08b7b32 (diff)
parent361384ebb9f41dbccbaab779a085edb773f0a734 (diff)
merge changes for latest viewer-development
Diffstat (limited to 'indra/llinventory/llparcel.cpp')
-rw-r--r--indra/llinventory/llparcel.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 0a4cd51ea0..e8cd871157 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -1348,3 +1348,12 @@ LLParcel::ECategory category_ui_string_to_category(const std::string& s)
// is a distinct option from "None" and "Other"
return LLParcel::C_ANY;
}
+
+void LLParcel::updateQuota( const LLUUID& objectId, const ParcelQuota& quota )
+{
+ if ( mID == objectId )
+ {
+ mQuota = quota;
+ }
+}
+