1 files changed, 84 insertions, 51 deletions

diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 15f5398..0e6056f 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -56,6 +56,7 @@
 #include "llcallbacklist.h"
 #include "llpreview.h"
 #include "llviewercontrol.h"
+#include "llvoavatar.h"
 #include "llsdutil.h"
 #include <deque>
 
@@ -304,7 +305,7 @@ LLUUID LLInventoryModel::findCategoryUUIDForType(LLAssetType::EType t, bool crea
                 LLUUID root_id = gAgent.getInventoryRootID();
                 if(root_id.notNull())
                 {
-                        rv = createNewCategory(root_id, t, NULL);
+                        rv = createNewCategory(root_id, t, LLStringUtil::null);
                 }
         }
         return rv;
@@ -344,7 +345,7 @@ LLUUID LLInventoryModel::findCatUUID(LLAssetType::EType preferred_type)
 // based on preferred type. Returns the UUID of the new category.
 LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
                                                                                    LLAssetType::EType preferred_type,
-                                                                                   const LLString& pname)
+                                                                                   const std::string& pname)
 {
         LLUUID id;
         if(!isInventoryUsable())
@@ -360,7 +361,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
         }
 
         id.generate();
-        LLString name = pname;
+        std::string name = pname;
         if(!pname.empty())
         {
                 name.assign(pname);
@@ -473,13 +474,13 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
 
 // Generates a string containing the path to the item specified by
 // item_id.
-void LLInventoryModel::appendPath(const LLUUID& id, LLString& path)
+void LLInventoryModel::appendPath(const LLUUID& id, std::string& path)
 {
-        LLString temp;
+        std::string temp;
         LLInventoryObject* obj = getObject(id);
         LLUUID parent_id;
         if(obj) parent_id = obj->getParentUUID();
-        LLString forward_slash("/");
+        std::string forward_slash("/");
         while(obj)
         {
                 obj = getCategory(parent_id);
@@ -1516,19 +1517,15 @@ void LLInventoryModel::cache(
                 items,
                 INCLUDE_TRASH,
                 can_cache);
-        char agent_id_str[UUID_STR_LENGTH];             /*Flawfinder: ignore*/
-        char inventory_filename[LL_MAX_PATH];           /*Flawfinder: ignore*/
+        std::string agent_id_str;
+        std::string inventory_filename;
         agent_id.toString(agent_id_str);
         std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, agent_id_str));
-        snprintf(                       /* Flawfinder: ignore */
-                inventory_filename,
-                LL_MAX_PATH,
-                CACHE_FORMAT_STRING,
-                path.c_str());
+        inventory_filename = llformat(CACHE_FORMAT_STRING, path.c_str());
         saveToFile(inventory_filename, categories, items);
         std::string gzip_filename(inventory_filename);
         gzip_filename.append(".gz");
-        if(gzip_file(inventory_filename, gzip_filename.c_str()))
+        if(gzip_file(inventory_filename, gzip_filename))
         {
                 lldebugs << "Successfully compressed " << inventory_filename << llendl;
                 LLFile::remove(inventory_filename);
@@ -1766,16 +1763,16 @@ bool LLInventoryModel::loadSkeleton(
                 response_t::const_iterator skel;
                 skel = (*it).find("name");
                 if(skel == no_response) goto clean_cat;
-                cat->rename(LLString((*skel).second.c_str()));
+                cat->rename(std::string((*skel).second));
                 skel = (*it).find("folder_id");
                 if(skel == no_response) goto clean_cat;
-                id.set((*skel).second.c_str());
+                id.set((*skel).second);
                 // if an id is null, it locks the viewer.
                 if(id.isNull()) goto clean_cat;
                 cat->setUUID(id);
                 skel = (*it).find("parent_id");
                 if(skel == no_response) goto clean_cat;
-                id.set((*skel).second.c_str());
+                id.set((*skel).second);
                 cat->setParent(id);
                 skel = (*it).find("type_default");
                 if(skel == no_response)
@@ -1805,25 +1802,21 @@ bool LLInventoryModel::loadSkeleton(
         {
                 cat_array_t categories;
                 item_array_t items;
-                char owner_id_str[UUID_STR_LENGTH];             /*Flawfinder: ignore*/
+                std::string owner_id_str;
                 owner_id.toString(owner_id_str);
                 std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, owner_id_str));
-                char inventory_filename[LL_MAX_PATH];           /*Flawfinder: ignore*/
-                snprintf(                       /* Flawfinder: ignore */
-                        inventory_filename,
-                        LL_MAX_PATH,
-                        CACHE_FORMAT_STRING,
-                        path.c_str());
+                std::string inventory_filename;
+                inventory_filename = llformat(CACHE_FORMAT_STRING, path.c_str());
                 const S32 NO_VERSION = LLViewerInventoryCategory::VERSION_UNKNOWN;
                 std::string gzip_filename(inventory_filename);
                 gzip_filename.append(".gz");
-                LLFILE* fp = LLFile::fopen(gzip_filename.c_str(), "rb");                /*Flawfinder: ignore*/
+                LLFILE* fp = LLFile::fopen(gzip_filename, "rb");
                 bool remove_inventory_file = false;
                 if(fp)
                 {
                         fclose(fp);
                         fp = NULL;
-                        if(gunzip_file(gzip_filename.c_str(), inventory_filename))
+                        if(gunzip_file(gzip_filename, inventory_filename))
                         {
                                 // we only want to remove the inventory file if it was
                                 // gzipped before we loaded, and we successfully
@@ -1977,14 +1970,14 @@ bool LLInventoryModel::loadMeat(
                 response_t::const_iterator meat;
                 meat = (*it).find("name");
                 if(meat == no_response) goto clean_item;
-                item->rename(LLString((*meat).second.c_str()));
+                item->rename(std::string((*meat).second));
                 meat = (*it).find("item_id");
                 if(meat == no_response) goto clean_item;
-                id.set((*meat).second.c_str());
+                id.set((*meat).second);
                 item->setUUID(id);
                 meat = (*it).find("parent_id");
                 if(meat == no_response) goto clean_item;
-                id.set((*meat).second.c_str());
+                id.set((*meat).second);
                 item->setParent(id);
                 meat = (*it).find("type");
                 if(meat == no_response) goto clean_item;
@@ -1998,7 +1991,7 @@ bool LLInventoryModel::loadMeat(
                 }
                 meat = (*it).find("data_id");
                 if(meat == no_response) goto clean_item;
-                id.set((*meat).second.c_str());
+                id.set((*meat).second);
                 if(LLAssetType::AT_CALLINGCARD == type)
                 {
                         LLPermissions perm;
@@ -2243,16 +2236,16 @@ void LLInventoryModel::buildParentChildMap()
 struct LLUUIDAndName
 {
         LLUUIDAndName() {}
-        LLUUIDAndName(const LLUUID& id, const LLString& name);
+        LLUUIDAndName(const LLUUID& id, const std::string& name);
         bool operator==(const LLUUIDAndName& rhs) const;
         bool operator<(const LLUUIDAndName& rhs) const;
         bool operator>(const LLUUIDAndName& rhs) const;
 
         LLUUID mID;
-        LLString mName;
+        std::string mName;
 };
 
-LLUUIDAndName::LLUUIDAndName(const LLUUID& id, const LLString& name) :
+LLUUIDAndName::LLUUIDAndName(const LLUUID& id, const std::string& name) :
         mID(id), mName(name)
 {
 }
@@ -2340,12 +2333,11 @@ bool LLUUIDAndName::operator>(const LLUUIDAndName& rhs) const
 //}
 
 // static
-bool LLInventoryModel::loadFromFile(
-        const char* filename,
-        LLInventoryModel::cat_array_t& categories,
-        LLInventoryModel::item_array_t& items)
+bool LLInventoryModel::loadFromFile(const std::string& filename,
+                                                                        LLInventoryModel::cat_array_t& categories,
+                                                                        LLInventoryModel::item_array_t& items)
 {
-        if(!filename)
+        if(filename.empty())
         {
                 llerrs << "Filename is Null!" << llendl;
                 return false;
@@ -2413,12 +2405,11 @@ bool LLInventoryModel::loadFromFile(
 }
 
 // static
-bool LLInventoryModel::saveToFile(
-        const char* filename,
-        const cat_array_t& categories,
-        const item_array_t& items)
+bool LLInventoryModel::saveToFile(const std::string& filename,
+                                                                  const cat_array_t& categories,
+                                                                  const item_array_t& items)
 {
-        if(!filename)
+        if(filename.empty())
         {
                 llerrs << "Filename is Null!" << llendl;
                 return false;
@@ -2993,7 +2984,7 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
 
         LLUUID item_id;
         LLUUID folder_id;
-        char new_name[MAX_STRING];              /*Flawfinder: ignore*/
+        std::string new_name;
         bool anything_changed = false;
         S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
         for(S32 i = 0; i < count; ++i)
@@ -3004,7 +2995,7 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
                 {
                         LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
                         msg->getUUIDFast(_PREHASH_InventoryData, _PREHASH_FolderID, folder_id, i);
-                        msg->getString("InventoryData", "NewName", MAX_STRING, new_name, i);
+                        msg->getString("InventoryData", "NewName", new_name, i);
 
                         lldebugs << "moving item " << item_id << " to folder "
                                          << folder_id << llendl;
@@ -3016,7 +3007,7 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
                         gInventory.accountForUpdate(update);
 
                         new_item->setParent(folder_id);
-                        if(strlen(new_name) > 0)                /*Flawfinder: ignore*/
+                        if (new_name.length() > 0)
                         {
                                 new_item->rename(new_name);
                         }
@@ -3074,6 +3065,45 @@ void LLInventoryModel::dumpInventory()
 /// LLInventoryCollectFunctor implementations
 ///----------------------------------------------------------------------------
 
+// static
+bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(LLInventoryItem* item)
+{
+        if (!item)
+                return false;
+
+        bool allowed = false;
+        LLVOAvatar* my_avatar = NULL;
+
+        switch(item->getType())
+        {
+        case LLAssetType::AT_CALLINGCARD:
+                // not allowed
+                break;
+                
+        case LLAssetType::AT_OBJECT:
+                my_avatar = gAgent.getAvatarObject();
+                if(my_avatar && !my_avatar->isWearingAttachment(item->getUUID()))
+                {
+                        allowed = true;
+                }
+                break;
+                
+        case LLAssetType::AT_BODYPART:
+        case LLAssetType::AT_CLOTHING:
+                if(!gAgent.isWearingItem(item->getUUID()))
+                {
+                        allowed = true;
+                }
+                break;
+                
+        default:
+                allowed = true;
+                break;
+        }
+
+        return allowed;
+}
+
 bool LLIsType::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 {
         if(mType == LLAssetType::AT_CATEGORY)
@@ -3206,7 +3236,7 @@ bool LLNameCategoryCollector::operator()(
 {
         if(cat)
         {
-                if (!LLString::compareInsensitive(mName.c_str(), cat->getName().c_str()))
+                if (!LLStringUtil::compareInsensitive(mName, cat->getName()))
                 {
                         return true;
                 }
@@ -3600,11 +3630,14 @@ void LLInventoryAddedObserver::changed(U32 mask)
         // the network, figure out which item was updated.
         // Code from Gigs Taggert, sin allowed by JC.
         LLMessageSystem* msg = gMessageSystem;
-        const char* msg_name = msg->getMessageName();
-        if (!msg_name) return;
-
+        std::string msg_name = msg->getMessageName();
+        if (msg_name.empty())
+        {
+                return;
+        }
+        
         // We only want newly created inventory items. JC
-        if ( strcmp(msg_name, "UpdateCreateInventoryItem") )
+        if ( msg_name != "UpdateCreateInventoryItem")
         {
                 return;
         }