diff options
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 6 | ||||
-rwxr-xr-x | indra/newview/llfloaterwebcontent.cpp | 2 | ||||
-rwxr-xr-x | indra/newview/llfloaterwebcontent.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6a84c4fca0..df2079a6e4 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10240,7 +10240,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>16.0</real> + <real>20.0</real> </map> <key>SceneLoadRearMaxRadiusFraction</key> <map> @@ -10251,7 +10251,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>20.0</real> + <real>75.0</real> </map> <key>SceneLoadRearPixelThreshold</key> <map> @@ -10262,7 +10262,7 @@ <key>Type</key> <string>F32</string> <key>Value</key> - <real>200.0</real> + <real>400.0</real> </map> <key>SceneLoadingMonitorEnabled</key> <map> diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 2987eb82b9..cb312a11c8 100755 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -56,7 +56,7 @@ LLFloaterWebContent::_Params::_Params() LLFloaterWebContent::LLFloaterWebContent( const Params& params ) : LLFloater( params ), - LLInstanceTracker<LLFloaterWebContent, std::string>(params.id()), + LLInstanceTracker<LLFloaterWebContent, std::string, LLInstanceTrackerReplaceOnCollision>(params.id()), mWebBrowser(NULL), mAddressCombo(NULL), mSecureLockIcon(NULL), 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> |