summaryrefslogtreecommitdiff
path: root/indra/llui/llresizebar.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-06-05 19:08:35 -0700
committerRichard Linden <none@none>2013-06-05 19:08:35 -0700
commit702bd5107a71aa3ac7c779a1e2ff0eaa53161e13 (patch)
treefeca9cc804b88e4f1b78a811ae7af359c67e5455 /indra/llui/llresizebar.cpp
parent6cf85d1bf3eae2d2d798b756100c048ec2b1c411 (diff)
parente1d96d72692d70f7e16fb93d6ef1d42c89d26409 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llui/llresizebar.cpp')
-rwxr-xr-x[-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..100755
--- 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