diff options
| author | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
|---|---|---|
| committer | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
| commit | 24b26d71ee01211aa796b8061b66ec06a133e4ce (patch) | |
| tree | 96bffcd019c933ad3ebbfd5f096968108b22aab5 /indra/newview/llfloaterland.h | |
| parent | 5dfd435872e36445dcc82f99443dfc5a7ee0805a (diff) | |
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
Diffstat (limited to 'indra/newview/llfloaterland.h')
| -rw-r--r-- | indra/newview/llfloaterland.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h index 520ed4147e..4c3de65d71 100644 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -186,6 +186,9 @@ protected: LLTextBox* mTextOwnerLabel; LLTextBox* mTextOwner; LLButton* mBtnProfile; + + LLTextBox* mContentRating; + LLTextBox* mLandType; LLTextBox* mTextGroup; LLTextBox* mTextGroupLabel; |