summaryrefslogtreecommitdiff
path: root/indra/llui/llresizebar.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-19 13:59:52 -0400
committerOz Linden <oz@lindenlab.com>2013-06-19 13:59:52 -0400
commite23228fef2834587af490d0345f29212445666d8 (patch)
treedfa761027aca1227ec1817707f8141b833c061df /indra/llui/llresizebar.cpp
parentc880c961bb2a0838bc529efc07cfeb12f5636d88 (diff)
parent8a330ee2eb1008951f5e5159057fa5736dd805b4 (diff)
merge 3.5.0-release
Diffstat (limited to 'indra/llui/llresizebar.cpp')
-rw-r--r--indra/llui/llresizebar.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/llresizebar.cpp b/indra/llui/llresizebar.cpp
index ba90fa5e0c..15e56cbfe5 100644
--- a/indra/llui/llresizebar.cpp
+++ b/indra/llui/llresizebar.cpp
@@ -45,7 +45,8 @@ LLResizeBar::LLResizeBar(const LLResizeBar::Params& p)
mSide( p.side ),
mSnappingEnabled(p.snapping_enabled),
mAllowDoubleClickSnapping(p.allow_double_click_snapping),
- mResizingView(p.resizing_view)
+ mResizingView(p.resizing_view),
+ mResizeListener(NULL)
{
setFollowsNone();
// set up some generically good follow code.
@@ -300,6 +301,11 @@ BOOL LLResizeBar::handleHover(S32 x, S32 y, MASK mask)
}
}
+ if (mResizeListener)
+ {
+ mResizeListener(NULL);
+ }
+
return handled;
} // end LLResizeBar::handleHover