summaryrefslogtreecommitdiff
path: root/indra/newview/llchicletbar.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-11-30 17:57:09 -0800
committerRichard Linden <none@none>2011-11-30 17:57:09 -0800
commitc191f523a915888b9d388e1736554dec64f7d887 (patch)
tree1a41f168db2dc9a70ea2890e120281c0d1f5410d /indra/newview/llchicletbar.h
parentf5a94e0f8196c5c068995090cd57bb27e97aaac9 (diff)
parent0323a37ac6c55e3ed599f60f4950c49e0e084c4a (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llchicletbar.h')
-rw-r--r--indra/newview/llchicletbar.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llchicletbar.h b/indra/newview/llchicletbar.h
index 224dfbb647..1427bf95e0 100644
--- a/indra/newview/llchicletbar.h
+++ b/indra/newview/llchicletbar.h
@@ -89,6 +89,12 @@ private:
*/
S32 getChicletPanelShrinkHeadroom() const;
+ /**
+ * function adjusts Chiclet bar width to prevent overlapping with Mini-Location bar
+ * EXP-1463
+ */
+ void fitWithTopInfoBar();
+
protected:
LLChicletBar(const LLSD& key = LLSD());