Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Interim commit before diving into reworking the inventory panel.

Browse Source
This commit is contained in:
Shyotl
2012-02-16 19:25:59 -06:00
parent a90d7bbb46
commit ae7b12f230
94 changed files with 15690 additions and 8311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llwearablelist.cpp
View File

@@ -38,10 +38,10 @@
#include "llassetstorage.h"
#include "llagent.h"
#include "llvoavatar.h"
#include "llviewerinventory.h"
//#include "llfloaterchat.h"
#include "llviewerstats.h"
#include "llnotificationsutil.h"
#include "llinventorymodel.h"
#include "lltrans.h"
// Callback struct
struct LLWearableArrivedData
@@ -71,7 +71,7 @@ struct LLWearableArrivedData
LLWearableList::~LLWearableList()
{
llassert_always(mList.empty()) ;
cleanup();
}
void LLWearableList::cleanup()
@@ -231,7 +231,7 @@ LLWearable* LLWearableList::createWearableMatchedToInventoryItem( LLWearable* ol
return wearable;
}
LLWearable* LLWearableList::createCopyFromAvatar( LLWearable* old_wearable, const std::string& new_name )
/*LLWearable* LLWearableList::createCopyFromAvatar( LLWearable* old_wearable, const std::string& new_name )
{
lldebugs << "LLWearableList::createCopyFromAvatar()" << llendl;
@@ -248,10 +248,10 @@ LLWearable* LLWearableList::createCopyFromAvatar( LLWearable* old_wearable, cons
wearable->saveNewAsset();
return wearable;
}
}*/
LLWearable* LLWearableList::createCopy( LLWearable* old_wearable )
LLWearable* LLWearableList::createCopy(const LLWearable* old_wearable, const std::string& new_name)
{
lldebugs << "LLWearableList::createCopy()" << llendl;
@@ -262,6 +262,7 @@ LLWearable* LLWearableList::createCopy( LLWearable* old_wearable )
perm.setOwnerAndGroup(LLUUID::null, gAgent.getID(), LLUUID::null, true);
wearable->setPermissions(perm);
if (!new_name.empty()) wearable->setName(new_name);
// Send to the dataserver
wearable->saveNewAsset();
@@ -276,8 +277,7 @@ LLWearable* LLWearableList::createNewWearable( LLWearableType::EType type )
LLWearable *wearable = generateNewWearable();
wearable->setType( type );
std::string name = "New ";
name.append( wearable->getTypeLabel() );
std::string name = LLWearableType::getTypeDefaultNewName(wearable->getType());
wearable->setName( name );
LLPermissions perm;
@@ -289,6 +289,9 @@ LLWearable* LLWearableList::createNewWearable( LLWearableType::EType type )
wearable->setParamsToDefaults();
wearable->setTexturesToDefaults();
//mark all values (params & images) as saved
wearable->saveValues();
// Send to the dataserver
wearable->saveNewAsset();