diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2009-08-27 19:00:18 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2009-08-27 19:00:18 +0000 |
| commit | 745845f79987e4b4ab7f5728746a0eda8898930f (patch) | |
| tree | f10efd4a638a6a7eda92a960cdb97e5256ff736a /indra/newview/llfloaterland.h | |
| parent | 71344b233d5ae3d5262a492b636af04544952611 (diff) | |
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
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 29d1c4dd84..749c395147 100644 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -64,6 +64,7 @@ class LLParcelSelection; class LLPanelLandGeneral; class LLPanelLandObjects; class LLPanelLandOptions; +class LLPanelLandAudio; class LLPanelLandMedia; class LLPanelLandAccess; class LLPanelLandBan; @@ -99,6 +100,7 @@ protected: static void* createPanelLandCovenant(void* data); static void* createPanelLandObjects(void* data); static void* createPanelLandOptions(void* data); + static void* createPanelLandAudio(void* data); static void* createPanelLandMedia(void* data); static void* createPanelLandAccess(void* data); static void* createPanelLandBan(void* data); @@ -112,6 +114,7 @@ protected: LLPanelLandGeneral* mPanelGeneral; LLPanelLandObjects* mPanelObjects; LLPanelLandOptions* mPanelOptions; + LLPanelLandAudio* mPanelAudio; LLPanelLandMedia* mPanelMedia; LLPanelLandAccess* mPanelAccess; LLPanelLandCovenant* mPanelCovenant; |