diff options
| author | Richard Linden <none@none> | 2013-11-20 16:21:03 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-20 16:21:03 -0800 |
| commit | 7a91ec40aae5f2908573cdf02d0394effee2c0e3 (patch) | |
| tree | 1cbd19af7a4cef8d693725ea64359196634a8a15 | |
| parent | 367e0e4cd381d7941e237bf1db58a266e2d8fdb5 (diff) | |
SH-4626 FIX: [INTERESTING RC] Viewer randomly crashes when I click on links in IMs or group IMs
| -rwxr-xr-x | indra/llcommon/llinstancetracker.h | 2 | ||||
| -rwxr-xr-x | 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 cfe690b9ec..9783644e66 100755 --- a/indra/llcommon/llinstancetracker.h +++ b/indra/llcommon/llinstancetracker.h @@ -224,7 +224,7 @@ private: 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 f22940cd07..ad56eec859 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> |