diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-17 13:53:44 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-17 13:53:44 -0800 |
| commit | f8f9e5a7fbe428c23c602a547a496c22736399b1 (patch) | |
| tree | 232219bfd0c365b8090d94100455abda655402a8 /indra/newview | |
| parent | 3f165e17663a89f789a0f8b704e15d8b2dacf662 (diff) | |
| parent | cf4c5117336349ff25f2c49131e9e26dc7b50e38 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_media_settings_security.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index cd16b29f99..df62c9628d 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -573,7 +573,7 @@ bool LLViewerMedia::isInterestingEnough(const LLVOVolume *object, const F64 &obj else { lldebugs << "object interest = " << object_interest << ", lowest loadable = " << sLowestLoadableImplInterest << llendl; - if(object_interest > sLowestLoadableImplInterest) + if(object_interest >= sLowestLoadableImplInterest) result = true; } 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 a018e04bd1..1f580831f9 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" |