summaryrefslogtreecommitdiff
path: root/indra/llui/llview.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-08 17:29:56 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-08 17:29:56 -0700
commitac6f0304c51b6b8c8e4414ff1bc254be78f0845d (patch)
tree0b211c8c84ff92e6cdbeeb8d0197314e4821a60c /indra/llui/llview.h
parent1aba6c119ef05a4cfd91325c8455dc8c60098746 (diff)
parentcdb57cb299097b203581a6ef99840350831c321c (diff)
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/llui/llview.h')
-rw-r--r--indra/llui/llview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index fd19309a56..1c35349510 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -505,7 +505,7 @@ public:
// Set up params after XML load before calling new(),
// usually to adjust layout.
- static void applyXUILayout(Params& p, LLView* parent);
+ static void applyXUILayout(Params& p, LLView* parent, LLRect layout_rect = LLRect());
// For re-export of floaters and panels, convert the coordinate system
// to be top-left based.