diff options
| -rw-r--r-- | indra/llui/llmultislider.cpp | 15 | ||||
| -rw-r--r-- | indra/newview/llenvironment.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml | 2 |
3 files changed, 18 insertions, 10 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp index b8f0a01b86..fbe0d3f065 100644 --- a/indra/llui/llmultislider.cpp +++ b/indra/llui/llmultislider.cpp @@ -507,17 +507,14 @@ BOOL LLMultiSlider::handleHover(S32 x, S32 y, MASK mask) { if (getEnabled()) { - if (mHoverSlider.empty() || !getSliderThumbRect(mHoverSlider).pointInRect(x, y)) + mHoverSlider.clear(); + std::map<std::string, LLRect>::iterator mIt = mThumbRects.begin(); + for (; mIt != mThumbRects.end(); mIt++) { - mHoverSlider.clear(); - std::map<std::string, LLRect>::iterator mIt = mThumbRects.begin(); - for (; mIt != mThumbRects.end(); mIt++) + if (mIt->second.pointInRect(x, y)) { - if (mIt->second.pointInRect(x, y)) - { - mHoverSlider = mIt->first; - break; - } + mHoverSlider = mIt->first; + break; } } } diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index a397f0f27a..bf8cf4b552 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -846,6 +846,17 @@ bool LLEnvironment::isInventoryEnabled() const void LLEnvironment::onRegionChange() { clearExperienceEnvironment(LLUUID::null, TRANSITION_DEFAULT); + + LLViewerRegion* cur_region = gAgent.getRegion(); + if (!cur_region) + { + return; + } + if (!cur_region->capabilitiesReceived()) + { + cur_region->setCapabilitiesReceivedCallback([](LLUUID region_id) { LLEnvironment::instance().requestRegion(); }); + return; + } requestRegion(); } diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml index 11a852f40b..50d4c52a10 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml @@ -82,7 +82,7 @@ initial_value="0" layout="topleft" left_delta="5" - min_val="0" + min_val="0.01" max_val="3" name="cloud_scale" top_delta="20" |