From 7a91ec40aae5f2908573cdf02d0394effee2c0e3 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 20 Nov 2013 16:21:03 -0800
Subject: [PATCH] SH-4626 FIX: [INTERESTING RC] Viewer randomly crashes when I
click on links in IMs or group IMs
---
indra/llcommon/llinstancetracker.h | 2 +-
indra/newview/llfloaterwebcontent.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index cfe690b9ec4..9783644e661 100755
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -224,7 +224,7 @@ class LLInstanceTracker : public LLInstanceTrackerBase
case LLInstanceTrackerErrorOnCollision:
{
// use assert here instead of LL_ERRS(), otherwise the error will be ignored since this call is made during global object initialization
- llassert_always_msg(false, "ERROR: Instance with this same key already exists!");
+ llassert_always_msg(false, "Instance with this same key already exists!");
break;
}
case LLInstanceTrackerReplaceOnCollision:
diff --git a/indra/newview/llfloaterwebcontent.h b/indra/newview/llfloaterwebcontent.h
index f22940cd072..ad56eec8590 100755
--- a/indra/newview/llfloaterwebcontent.h
+++ b/indra/newview/llfloaterwebcontent.h
@@ -40,11 +40,11 @@ class LLIconCtrl;
class LLFloaterWebContent :
public LLFloater,
public LLViewerMediaObserver,
- public LLInstanceTracker<LLFloaterWebContent, std::string>
+ public LLInstanceTracker<LLFloaterWebContent, std::string, LLInstanceTrackerReplaceOnCollision>
{
public:
- typedef LLInstanceTracker<LLFloaterWebContent, std::string> instance_tracker_t;
+ typedef LLInstanceTracker<LLFloaterWebContent, std::string, LLInstanceTrackerReplaceOnCollision> instance_tracker_t;
LOG_CLASS(LLFloaterWebContent);
struct _Params : public LLInitParam::Block<_Params>
--
GitLab