summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-04-17 17:19:55 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-04-17 17:19:55 +0300
commit884d5024a3b2b7b65f2e05e29073ccab7fac6762 (patch)
tree944e122394e8a7a5dad818248fc21ab144ea2780 /indra/newview/llfloatermodelpreview.cpp
parent3ab32456a0e2fde64b405ac9d53150dfe9561ffe (diff)
SL-13061 Fixed missing scroll handling
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rw-r--r--indra/newview/llfloatermodelpreview.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 02ebac3b51..5895ebe7d7 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1015,8 +1015,11 @@ BOOL LLFloaterModelPreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
mModelPreview->zoom((F32)clicks * -0.2f);
mModelPreview->refresh();
}
-
- return TRUE;
+ else
+ {
+ LLFloaterModelUploadBase::handleScrollWheel(x, y, clicks);
+ }
+ return TRUE;
}
/*virtual*/