summaryrefslogtreecommitdiff
path: root/indra/newview/llbottomtray.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-19 12:57:03 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-19 12:57:03 -0800
commit705e31f16ad2e9b530bc083db13d29cbc8613f82 (patch)
treebbf7a443c649f4561e7f70a787b83e6555afe0d0 /indra/newview/llbottomtray.cpp
parentcd5cd11ccbd1ad13afd43c045735f01dbc994a80 (diff)
parent85c97cab02b0f2ba89b7af05c14a69ff90ffa25e (diff)
PE merge.
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
-rw-r--r--indra/newview/llbottomtray.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 9b215e4096..988867ef84 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -330,6 +330,11 @@ void LLBottomTray::setVisible(BOOL visible)
}
}
}
+
+ if(visible)
+ gFloaterView->setSnapOffsetBottom(getRect().getHeight());
+ else
+ gFloaterView->setSnapOffsetBottom(0);
}
void LLBottomTray::showBottomTrayContextMenu(S32 x, S32 y, MASK mask)