aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwearablelist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llwearablelist.cpp')
-rw-r--r--linden/indra/newview/llwearablelist.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index 512c03f..954321f 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -43,6 +43,9 @@
43#include "llviewerstats.h" 43#include "llviewerstats.h"
44#include "llnotify.h" 44#include "llnotify.h"
45 45
46#include "llstartup.h"
47#include "llpanellogin.h"
48
46// Globals 49// Globals
47LLWearableList gWearableList; // Globally constructed; be careful that there's no dependency with gAgent. 50LLWearableList gWearableList; // Globally constructed; be careful that there's no dependency with gAgent.
48 51
@@ -195,12 +198,15 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
195 } 198 }
196 else if (data->mName.empty()) 199 else if (data->mName.empty())
197 { 200 {
198 LLNotifications::instance().add("FailedToFindWearableUnnamed", args); 201 // work around missing avatar part spam on grid to grid teleport login
202 //if(LLStartUp::shouldAutoLogin() && !gLoginHandler.mPassword.empty()) Jacek - Grid manager stuff that's changed with 1.23
203 LLNotifications::instance().add("FailedToFindWearableUnnamed", args);
199 } 204 }
200 else 205 else
201 { 206 {
202 args["DESC"] = data->mName; 207 args["DESC"] = data->mName;
203 LLNotifications::instance().add("FailedToFindWearable", args); 208 //if(LLStartUp::shouldAutoLogin() && !gLoginHandler.mPassword.empty()) Jacek - Grid manager stuff that's changed with 1.23
209 LLNotifications::instance().add("FailedToFindWearable", args);
204 } 210 }
205 } 211 }
206 // Always call callback; wearable will be NULL if we failed 212 // Always call callback; wearable will be NULL if we failed