diff options
author | Armin Weatherwax | 2010-04-26 14:34:27 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-04-28 19:15:03 +0200 |
commit | 6360bdffd4c513ea0d4cf59c9b1a68d7cf62f65c (patch) | |
tree | 60b044fcef0bcbf5c75ee3051d3e51f82f1295d5 /linden/indra/newview | |
parent | fix: crash on relog; appearence self pie greyed out after relog. (diff) | |
download | meta-impy-6360bdffd4c513ea0d4cf59c9b1a68d7cf62f65c.zip meta-impy-6360bdffd4c513ea0d4cf59c9b1a68d7cf62f65c.tar.gz meta-impy-6360bdffd4c513ea0d4cf59c9b1a68d7cf62f65c.tar.bz2 meta-impy-6360bdffd4c513ea0d4cf59c9b1a68d7cf62f65c.tar.xz |
fix: Bug #163 new clothing is created in Lost&Found after logging back in.
Diffstat (limited to 'linden/indra/newview')
-rw-r--r-- | linden/indra/newview/llagent.cpp | 9 | ||||
-rw-r--r-- | linden/indra/newview/llwearablelist.cpp | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp index ebdbc53..c44fe3a 100644 --- a/linden/indra/newview/llagent.cpp +++ b/linden/indra/newview/llagent.cpp | |||
@@ -458,8 +458,15 @@ void LLAgent::init() | |||
458 | //----------------------------------------------------------------------------- | 458 | //----------------------------------------------------------------------------- |
459 | void LLAgent::cleanup() | 459 | void LLAgent::cleanup() |
460 | { | 460 | { |
461 | mInitialized = FALSE; | 461 | // cleanup wearables |
462 | for( S32 i = 0; i < WT_COUNT; i++ ) | ||
463 | { | ||
464 | mWearableEntry[ i ].mWearable = NULL; | ||
465 | mWearableEntry[ i ].mItemID.setNull(); | ||
466 | } | ||
462 | mWearablesLoaded = FALSE; | 467 | mWearablesLoaded = FALSE; |
468 | |||
469 | mInitialized = FALSE; | ||
463 | mShowAvatar = TRUE; | 470 | mShowAvatar = TRUE; |
464 | 471 | ||
465 | setSitCamera(LLUUID::null); | 472 | setSitCamera(LLUUID::null); |
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp index 954321f..7952bae 100644 --- a/linden/indra/newview/llwearablelist.cpp +++ b/linden/indra/newview/llwearablelist.cpp | |||
@@ -223,7 +223,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID | |||
223 | // Creates a new wearable just like the old_wearable but with data copied over from item | 223 | // Creates a new wearable just like the old_wearable but with data copied over from item |
224 | LLWearable* LLWearableList::createWearableMatchedToInventoryItem( LLWearable* old_wearable, LLViewerInventoryItem* item ) | 224 | LLWearable* LLWearableList::createWearableMatchedToInventoryItem( LLWearable* old_wearable, LLViewerInventoryItem* item ) |
225 | { | 225 | { |
226 | lldebugs << "LLWearableList::createWearableMatchedToInventoryItem()" << llendl; | 226 | LL_DEBUGS("Wearable") << "LLWearableList::createWearableMatchedToInventoryItem()" << LL_ENDL; |
227 | 227 | ||
228 | LLTransactionID tid; | 228 | LLTransactionID tid; |
229 | LLAssetID new_asset_id; | 229 | LLAssetID new_asset_id; |
@@ -247,7 +247,7 @@ LLWearable* LLWearableList::createWearableMatchedToInventoryItem( LLWearable* ol | |||
247 | 247 | ||
248 | LLWearable* LLWearableList::createCopyFromAvatar( LLWearable* old_wearable, const std::string& new_name ) | 248 | LLWearable* LLWearableList::createCopyFromAvatar( LLWearable* old_wearable, const std::string& new_name ) |
249 | { | 249 | { |
250 | lldebugs << "LLWearableList::createCopyFromAvatar()" << llendl; | 250 | LL_DEBUGS("Wearable") << "LLWearableList::createCopyFromAvatar()" << LL_ENDL; |
251 | 251 | ||
252 | LLTransactionID tid; | 252 | LLTransactionID tid; |
253 | LLAssetID new_asset_id; | 253 | LLAssetID new_asset_id; |
@@ -274,7 +274,7 @@ LLWearable* LLWearableList::createCopyFromAvatar( LLWearable* old_wearable, cons | |||
274 | 274 | ||
275 | LLWearable* LLWearableList::createCopy( LLWearable* old_wearable ) | 275 | LLWearable* LLWearableList::createCopy( LLWearable* old_wearable ) |
276 | { | 276 | { |
277 | lldebugs << "LLWearableList::createCopy()" << llendl; | 277 | LL_DEBUGS("Wearable") << "LLWearableList::createCopy()" << LL_ENDL; |
278 | 278 | ||
279 | LLTransactionID tid; | 279 | LLTransactionID tid; |
280 | LLAssetID new_asset_id; | 280 | LLAssetID new_asset_id; |
@@ -296,7 +296,7 @@ LLWearable* LLWearableList::createCopy( LLWearable* old_wearable ) | |||
296 | 296 | ||
297 | LLWearable* LLWearableList::createNewWearable( EWearableType type ) | 297 | LLWearable* LLWearableList::createNewWearable( EWearableType type ) |
298 | { | 298 | { |
299 | lldebugs << "LLWearableList::createNewWearable()" << llendl; | 299 | LL_DEBUGS("Wearable") << "LLWearableList::createNewWearable()" << LL_ENDL; |
300 | 300 | ||
301 | LLTransactionID tid; | 301 | LLTransactionID tid; |
302 | LLAssetID new_asset_id; | 302 | LLAssetID new_asset_id; |