merge

1 files changed, 19 insertions, 5 deletions

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c35173a7d4..48d11e1f05 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -50,6 +50,7 @@
 #include "llagentcamera.h"
 #include "llcallingcard.h"
 #include "llbuycurrencyhtml.h"
+#include "llfirstuse.h"
 #include "llfloaterbuyland.h"
 #include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
@@ -932,6 +933,15 @@ protected:
 //one global instance to bind them
 LLOpenTaskOffer* gNewInventoryObserver=NULL;
 
+class LLNewInventoryHintObserver : public LLInventoryAddedObserver
+{
+protected:
+	/*virtual*/ void done()
+	{
+		LLFirstUse::newInventory();
+	}
+};
+
 void start_new_inventory_observer()
 {
 	if (!gNewInventoryObserver) //task offer observer 
@@ -947,6 +957,8 @@ void start_new_inventory_observer()
 		gInventoryMoveObserver = new LLViewerInventoryMoveFromWorldObserver;
 		gInventory.addObserver(gInventoryMoveObserver);
 	}
+
+	gInventory.addObserver(new LLNewInventoryHintObserver());
 }
 
 class LLDiscardAgentOffer : public LLInventoryFetchItemsObserver
@@ -1873,6 +1885,8 @@ void inventory_offer_handler(LLOfferInfo* info)
 		    LLPostponedNotification::add<LLPostponedOfferNotification>(p, info->mFromID, false);
 		}
 	}
+
+	LLFirstUse::newInventory();
 }
 
 bool lure_callback(const LLSD& notification, const LLSD& response)
@@ -3173,10 +3187,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		}
 		else
 		{
-			LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
-		}
+		LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args);
 	}
 }
+}
 
 
 // Simulator we're on is informing the viewer that the agent
@@ -5886,8 +5900,8 @@ void process_teleport_local(LLMessageSystem *msg,void**)
 		}
 		else
 		{
-			gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
-		}
+		gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
+	}
 	}
 
 	// Sim tells us whether the new position is off the ground
@@ -5905,7 +5919,7 @@ void process_teleport_local(LLMessageSystem *msg,void**)
 
 	if ( !(gAgent.getTeleportKeepsLookAt() && LLViewerJoystick::getInstance()->getOverrideCamera()) )
 	{
-		gAgentCamera.resetView(TRUE, TRUE);
+	gAgentCamera.resetView(TRUE, TRUE);
 	}
 
 	// send camera update to new region