Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.

Made a few non-functional changes to help it apply.

1 files changed, 25 insertions, 0 deletions

diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 1029a3c..e662058 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -2876,6 +2876,14 @@ void LLInventoryModel::processSaveAssetIntoInventory(LLMessageSystem* msg,
                 llinfos << "LLInventoryModel::processSaveAssetIntoInventory item"
                         " not found: " << item_id << llendl;
         }
+
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0e
+        if (rlv_handler_t::isEnabled())
+        {
+                gRlvHandler.onSavedAssetIntoInventory(item_id);
+        }
+// [/RLVa:KB]
+
         if(gViewerWindow)
         {
                 gViewerWindow->getWindow()->decBusyCount();
@@ -2918,6 +2926,23 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
                 //              << llendl;
                 if(tfolder->getUUID().notNull())
                 {
+// [RLVa:KB] - Checked: 2009-08-07 (RLVa-1.0.1f) | Added: RLVa-1.0.0f
+                        // TODO-RLVa: this really shouldn't go here, but if the inventory offer spans multiple BulkUpdateInventory messages
+                        //            then the second message will cause the viewer to show the folder under its original name even though
+                        //                        it is renamed properly on the inventory server
+                        if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getForbidGiveToRLV()) )
+                        {
+                                LLViewerInventoryCategory* pRlvRoot = gRlvHandler.getSharedRoot();
+                                std::string strName = tfolder->getName();
+                                if ((pRlvRoot) && (pRlvRoot->getUUID() == tfolder->getParentUUID() ) && (strName.find(RLV_PUTINV_PREFIX) == 0))
+                                {
+                                        strName.erase(0, strName.find(RLV_FOLDER_PREFIX_PUTINV)); // Strips the prefix while retaining while the '~'
+                                        tfolder->rename(strName);
+                                        tfolder->updateServer(FALSE);
+                                }
+                        }
+// [/RLVa:KB]
+
                         folders.push_back(tfolder);
                         LLViewerInventoryCategory* folderp = gInventory.getCategory(tfolder->getUUID());
                         if(folderp)