Merge branch 'master' into V2Renderer

indra/newview/chatbar_as_cmdline.cpp

@@ -41,6 +41,7 @@
 #include "llviewerregion.h"
 #include "llworld.h"
 #include "lluuid.h"
+#include "lleventtimer.h"
 #include "llviewercontrol.h"
 
 #include "material_codes.h"

indra/newview/floaterao.h

@@ -5,6 +5,7 @@
 #include "llfloater.h"
 #include "llviewercontrol.h"
 #include "llagent.h"
+#include "lleventtimer.h"
 
 
 class AONoteCardDropTarget;

indra/newview/floaterlocalassetbrowse.h

@@ -42,6 +42,7 @@ tag: vaa emerald local_asset_browser
 #include "llscrolllistctrl.h"
 #include "lltexturectrl.h"
 #include "lldrawable.h"
+#include "lleventtimer.h"
 
 
 /*=======================================*/

indra/newview/llappviewer.cpp

@@ -44,6 +44,7 @@
 #include "lltexteditor.h"
 #include "llalertdialog.h"
 #include "llerrorcontrol.h"
+#include "lleventtimer.h"
 #include "llviewertexturelist.h"
 #include "llgroupmgr.h"
 #include "llagent.h"

indra/newview/llbuildnewviewsscheduler.h

@@ -1,6 +1,7 @@
 // <edit>
 #include "llinventoryview.h"
 #include "llinventory.h"
+#include "lleventtimer.h"
 class LLBuildNewViewsScheduler : public LLEventTimer
 {
 	typedef struct

indra/newview/lleventpoll.cpp

@@ -39,8 +39,9 @@
 #include "llhttpclient.h"
 #include "llhttpstatuscodes.h"
 #include "llsdserialize.h"
-#include "llsdutil.h" 
-#include "lltimer.h"
+#include "lleventtimer.h"
+#include "llsdutil.h"
+
 #include "llviewerregion.h"
 #include "message.h"
 #include "lltrans.h"

indra/newview/llfasttimerview.cpp

@@ -81,6 +81,7 @@ static struct ft_display_info ft_display_table[] =
 	{ LLFastTimer::FTM_MESSAGES,			" System Messages",		&LLColor4::grey1, 1 },
 	{ LLFastTimer::FTM_MOUSEHANDLER,		"  Mouse",				&LLColor4::grey1, 0 },
 	{ LLFastTimer::FTM_KEYHANDLER,			"  Keyboard",			&LLColor4::grey1, 0 },
+	{ LLFastTimer::FT_STRING_FORMAT,		" String Format",		&LLColor4::grey3, 0 },
 	{ LLFastTimer::FTM_SLEEP,				" Sleep",				&LLColor4::grey2, 0 },
 	{ LLFastTimer::FTM_IDLE,				" Idle",				&blue0, 0 },
 	{ LLFastTimer::FTM_PUMP,				"  Pump",				&LLColor4::magenta2, 1 },

indra/newview/llfloaterexploresounds.h

@@ -5,6 +5,7 @@
 
 #include "llfloater.h"
 #include "llaudioengine.h"
+#include "lleventtimer.h"
 
 class LLFloaterExploreSounds
 : public LLFloater, public LLEventTimer

indra/newview/llfloaterfriends.cpp

@@ -62,7 +62,7 @@
 #include "llmenucommands.h"
 #include "llviewercontrol.h"
 #include "llviewermessage.h"
-#include "lltimer.h"
+#include "lleventtimer.h"
 #include "lltextbox.h"
 #include "llvoiceclient.h"
 

indra/newview/llfloaterfriends.h

@@ -38,7 +38,7 @@
 #include "llpanel.h"
 #include "llstring.h"
 #include "lluuid.h"
-#include "lltimer.h"
+#include "lleventtimer.h"
 #include "llcallingcard.h"
 
 class LLFriendObserver;

indra/newview/llfloatermessagelog.cpp

@@ -10,6 +10,7 @@
 #include "llmessagetemplate.h"
 #include <boost/tokenizer.hpp>
 #include "llmenugl.h"
+#include "lleventtimer.h"
 
 #include "llagent.h"
 

indra/newview/llfloatermessagelog.h

@@ -2,6 +2,7 @@
 #include "llfloater.h"
 #include "llmessagelog.h"
 #include "lltemplatemessagereader.h"
+#include "lleventtimer.h"
 
 class LLNetListItem
 {

indra/newview/llinventorymodel.cpp

@@ -1972,6 +1972,23 @@ void LLInventoryModel::addItem(LLViewerInventoryItem* item)
 	//llinfos << "LLInventoryModel::addItem()" << llendl;
 	if(item)
 	{
+		// This can happen if assettype enums from llassettype.h ever change.
+		// For example, there is a known backwards compatibility issue in some viewer prototypes prior to when 
+		// the AT_LINK enum changed from 23 to 24.
+		if ((item->getType() == LLAssetType::AT_NONE)
+		    || LLAssetType::lookup(item->getType()) == LLAssetType::badLookup())
+		{
+			llwarns << "Got bad asset type for item [ name: " << item->getName() << " type: " << item->getType() << " inv-type: " << item->getInventoryType() << " ], ignoring." << llendl;
+			return;
+		}
+
+		// This condition means that we tried to add a link without the baseobj being in memory.
+		// The item will show up as a broken link.
+		if (item->getIsBrokenLink())
+		{
+			llinfos << "Adding broken link [ name: " << item->getName() << " itemID: " << item->getUUID() << " assetID: " << item->getAssetUUID() << " )  parent: " << item->getParentUUID() << llendl;
+		}
+
 		mItemMap[item->getUUID()] = item;
 	}
 }

indra/newview/llnotify.cpp

@@ -99,7 +99,9 @@ bool LLNotifyBox::onNotification(const LLSD& notify)
 	if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change")
 	{
 		//bring existing notification to top
-		LLNotifyBox* boxp = LLNotifyBox::getInstance(notification->getID());
+		//This getInstance is ugly, as LLNotifyBox is derived from both LLInstanceTracker and LLEventTimer, which also is derived from its own LLInstanceTracker
+		//Have to explicitly determine which getInstance function to use.
+		LLNotifyBox* boxp = LLNotifyBox::LLInstanceTracker<LLNotifyBox, LLUUID>::getInstance(notification->getID());
 		if (boxp && !boxp->isDead())
 		{
 			gNotifyBoxView->showOnly(boxp);
@@ -116,7 +118,7 @@ bool LLNotifyBox::onNotification(const LLSD& notify)
 	}
 	else if (notify["sigtype"].asString() == "delete")
 	{
-		LLNotifyBox* boxp = LLNotifyBox::getInstance(notification->getID());
+		LLNotifyBox* boxp = LLNotifyBox::LLInstanceTracker<LLNotifyBox, LLUUID>::getInstance(notification->getID());
 		if (boxp && !boxp->isDead())
 		{
 			boxp->close();

indra/newview/llnotify.h

@@ -35,7 +35,7 @@
 
 #include "llfontgl.h"
 #include "llpanel.h"
-#include "lltimer.h"
+#include "lleventtimer.h"
 #include "llnotifications.h"
 #include <vector>
 

indra/newview/llpreviewscript.h

@@ -40,7 +40,7 @@
 #include "llcombobox.h"
 #include "lliconctrl.h"
 #include "llframetimer.h"
-#include "lltimer.h"
+#include "lleventtimer.h"
 
 
 class LLMessageSystem;

indra/newview/llviewermessage.cpp

@@ -64,7 +64,7 @@
 #include "llxfermanager.h"
 #include "message.h"
 #include "sound_ids.h"
-#include "lltimer.h"
+#include "lleventtimer.h"
 #include "llmd5.h"
 
 #include "llagent.h"

indra/newview/llviewerparcelmediaautoplay.h

@@ -33,7 +33,7 @@
 #ifndef LLVIEWERPARCELMEDIAAUTOPLAY_H
 #define LLVIEWERPARCELMEDIAAUTOPLAY_H
 
-#include "lltimer.h"
+#include "lleventtimer.h"
 
 // timer to automatically play media
 class LLViewerParcelMediaAutoPlay : LLEventTimer

indra/newview/llwindebug.cpp

@@ -429,7 +429,7 @@ void WINAPI Get_Call_Stack(const EXCEPTION_RECORD* exception_record,
 		if (Get_Module_By_Ret_Addr(Ebp->Ret_Addr, Module_Name, Module_Addr))
 		{
 			// Save module's address and full path.
-			tmp_info["CallStack"][Ret_Addr_I]["ModuleName"] = ll_convert_wide_to_string(Module_Name);
+			tmp_info["CallStack"][Ret_Addr_I]["ModuleName"] = ll_convert_wide_to_string(Module_Name,CP_ACP);
 			tmp_info["CallStack"][Ret_Addr_I]["ModuleAddress"] = (int)Module_Addr;
 			tmp_info["CallStack"][Ret_Addr_I]["CallOffset"] = (int)(Ebp->Ret_Addr - Module_Addr);
 
@@ -548,7 +548,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
 	Get_Version_Str(info);
 	
 	GetModuleFileName(NULL, Str, MAX_PATH);
-	info["Process"] = ll_convert_wide_to_string(Str);
+	info["Process"] = ll_convert_wide_to_string(Str,CP_ACP);
 	info["ThreadID"] = (S32)GetCurrentThreadId();
 
 	// If exception occurred.
@@ -560,7 +560,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
 		// If module with E.ExceptionAddress found - save its path and date.
 		if (Get_Module_By_Ret_Addr((PBYTE)E.ExceptionAddress, Module_Name, Module_Addr))
 		{
-			info["Module"] = ll_convert_wide_to_string(Module_Name);
+			info["Module"] = ll_convert_wide_to_string(Module_Name,CP_ACP);
 
 			if ((hFile = CreateFile(Module_Name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
 				FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE)

indra/newview/rlvhandler.h

@@ -22,6 +22,7 @@
 #include "llstartup.h"
 #include "llviewerjointattachment.h"
 #include "llviewerobject.h"
+#include "lleventtimer.h"
 
 #include "rlvcommon.h"
 #include "rlvhelper.h"

indra/newview/rlvhelper.h

@@ -24,6 +24,7 @@
 #include "llviewerinventory.h"
 #include "llvoavatar.h"
 #include "llwlparamset.h"
+#include "lleventtimer.h"
 #include "rlvdefines.h"
 #include "rlvcommon.h"
 

indra/newview/rlvlocks.h

@@ -28,6 +28,7 @@
 #include "llviewerjointattachment.h"
 #include "llviewerobject.h"
 #include "llvoavatar.h"
+#include "lleventtimer.h"
 
 #include "rlvdefines.h"