diff options
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index d26acaa892..89c91bbf2b 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -398,12 +398,18 @@ BOOL LLFloaterWorldMap::handleScrollWheel(S32 x, S32 y, S32 clicks) { if (!isMinimized() && isFrontmost()) { - F32 slider_value = (F32)childGetValue("zoom slider").asReal(); - slider_value += ((F32)clicks * -0.3333f); - childSetValue("zoom slider", LLSD(slider_value)); - return TRUE; + LLRect area; + childGetRect("search_results", area); + if(!area.pointInRect(x, y)) + { + F32 slider_value = (F32)childGetValue("zoom slider").asReal(); + slider_value += ((F32)clicks * -0.3333f); + childSetValue("zoom slider", LLSD(slider_value)); + return TRUE; + } } - return FALSE; + + return LLFloater::handleScrollWheel(x, y, clicks); } |