diff options
| author | angela <angela@lindenlab.com> | 2010-03-03 13:52:14 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-03-03 13:52:14 +0800 |
| commit | 5777dfaae6268dffee83d7a457c024b1a89f81ff (patch) | |
| tree | 063583a1f9f7441356814be5891e6a7bcc61b9d4 /indra/newview/llfloaterworldmap.cpp | |
| parent | 70cc2d6974d034055e177a16c9fccc3b7b5e7c63 (diff) | |
| parent | 3c443a9287f5827316f96a14316f53e3919c57ac (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index b6de409611..67c0b530eb 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -359,9 +359,7 @@ BOOL LLFloaterWorldMap::handleScrollWheel(S32 x, S32 y, S32 clicks) { if (!isMinimized() && isFrontmost()) { - LLRect area; - childGetRect("search_results", area); - if(!area.pointInRect(x, y)) + if(mPanel->pointInView(x, y)) { F32 slider_value = (F32)childGetValue("zoom slider").asReal(); slider_value += ((F32)clicks * -0.3333f); |