From 20e51aa3aabf5a83f8538cb457b279d12569c267 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Thu, 17 Dec 2009 11:52:15 -0800 Subject: Quiet some logging, make sure if 1024 is lowest we still load it --- indra/newview/llviewermedia.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 103a70e032..f5b6ae038e 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -582,8 +582,8 @@ bool LLViewerMedia::isInterestingEnough(const LLVOVolume *object, const F64 &obj } else { - llinfos << "object interest = " << object_interest << ", lowest loadable = " << sLowestLoadableImplInterest << llendl; - if(object_interest > sLowestLoadableImplInterest) + lldebugs << "object interest = " << object_interest << ", lowest loadable = " << sLowestLoadableImplInterest << llendl; + if(object_interest >= sLowestLoadableImplInterest) result = true; } -- cgit v1.2.3 From cf4c5117336349ff25f2c49131e9e26dc7b50e38 Mon Sep 17 00:00:00 2001 From: Rick Pasetto Date: Thu, 17 Dec 2009 13:50:48 -0800 Subject: Change "url prefix" to "url pattern" --- indra/newview/skins/default/xui/en/panel_media_settings_security.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml index 1f41a0d284..e393df79e9 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml @@ -17,7 +17,7 @@ font="SansSerifSmall" height="16" initial_value="false" - label="Only Allow Access to Specified URLs (by prefix)" + label="Only Allow Access to Specified URL patterns" left="10" mouse_opaque="true" name="whitelist_enable" -- cgit v1.2.3