diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-30 15:56:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-30 15:56:38 -0400 |
| commit | 74d199c1dd10660f72293c84888af412764f1da8 (patch) | |
| tree | 0b4c4137abde8283c5a85da08f19de1aea335c2a /indra/llui/llview.h | |
| parent | 3c3ee709677a0c60420eae84a55a7b61113b4949 (diff) | |
| parent | 6e4e971fd27826f90c1728c7fd17242083e230fc (diff) | |
merge changes for vmrg-233
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 2 |
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. |