Merged 'armin/grid-manager5' into login-manager

Conflicts:
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/llpanellogin.cpp

1 files changed, 8 insertions, 2 deletions

diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index 2d4f26a..4e91975 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -42,6 +42,9 @@
 #include "llviewerstats.h"
 #include "llnotify.h"
 
+#include "llstartup.h"
+#include "llpanellogin.h"
+
 // Globals
 LLWearableList gWearableList; // Globally constructed; be careful that there's no dependency with gAgent.
 
@@ -185,12 +188,15 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
                 args["[TYPE]"] = LLAssetType::lookupHumanReadable(data->mAssetType);
                 if (data->mName.empty())
                 {
-                        LLNotifyBox::showXml("FailedToFindWearableUnnamed", args);
+                        // work around missing avatar part spam on grid to grid teleport login
+                        if(LLStartUp::shouldAutoLogin() && !gLoginHandler.mPassword.empty())
+                           LLNotifyBox::showXml("FailedToFindWearableUnnamed", args);
                 }
                 else
                 {
                         args["[DESC]"] = data->mName;
-                        LLNotifyBox::showXml("FailedToFindWearable", args);
+                        if(LLStartUp::shouldAutoLogin() && !gLoginHandler.mPassword.empty())
+                                LLNotifyBox::showXml("FailedToFindWearable", args);
                 }
         }
         // Always call callback; wearable will be NULL if we failed