diff options
author | Armin Weatherwax | 2010-09-07 14:19:02 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:42:40 +0200 |
commit | a96260616070518acc70572dce4e74890ee8c529 (patch) | |
tree | bd686799969e2bdaadc9f8f0c4aec1f0eea2a882 /linden/indra/newview/llpanellandmedia.h | |
parent | port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 text... (diff) | |
download | meta-impy-a96260616070518acc70572dce4e74890ee8c529.zip meta-impy-a96260616070518acc70572dce4e74890ee8c529.tar.gz meta-impy-a96260616070518acc70572dce4e74890ee8c529.tar.bz2 meta-impy-a96260616070518acc70572dce4e74890ee8c529.tar.xz |
fix "about land" (actually llpanellandmedia) crashes
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanellandmedia.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/linden/indra/newview/llpanellandmedia.h b/linden/indra/newview/llpanellandmedia.h index d63f0f6..845b953 100644 --- a/linden/indra/newview/llpanellandmedia.h +++ b/linden/indra/newview/llpanellandmedia.h | |||
@@ -56,10 +56,8 @@ private: | |||
56 | static void onCommitAny(LLUICtrl* ctrl, void *userdata); | 56 | static void onCommitAny(LLUICtrl* ctrl, void *userdata); |
57 | static void onCommitType(LLUICtrl* ctrl, void *userdata); | 57 | static void onCommitType(LLUICtrl* ctrl, void *userdata); |
58 | static void onSetBtn(void* userdata); | 58 | static void onSetBtn(void* userdata); |
59 | static void onResetBtn(void* userdata); | 59 | static void onClickSoundHelp(void*); |
60 | static void onClickAddURLFilter(void *userdata); | 60 | |
61 | static void onClickRemoveURLFilter(void *userdata); | ||
62 | |||
63 | private: | 61 | private: |
64 | LLCheckBoxCtrl* mCheckSoundLocal; | 62 | LLCheckBoxCtrl* mCheckSoundLocal; |
65 | LLButton* mSoundHelpButton; | 63 | LLButton* mSoundHelpButton; |
@@ -71,11 +69,8 @@ private: | |||
71 | LLLineEditor* mMediaDescEdit; | 69 | LLLineEditor* mMediaDescEdit; |
72 | LLComboBox* mMediaTypeCombo; | 70 | LLComboBox* mMediaTypeCombo; |
73 | LLButton* mSetURLButton; | 71 | LLButton* mSetURLButton; |
74 | LLButton* mResetURLButton; | ||
75 | LLSpinCtrl* mMediaResetCtrl; | ||
76 | LLSpinCtrl* mMediaHeightCtrl; | 72 | LLSpinCtrl* mMediaHeightCtrl; |
77 | LLSpinCtrl* mMediaWidthCtrl; | 73 | LLSpinCtrl* mMediaWidthCtrl; |
78 | LLTextBox* mMediaResetCtrlLabel; | ||
79 | LLTextBox* mMediaSizeCtrlLabel; | 74 | LLTextBox* mMediaSizeCtrlLabel; |
80 | LLTextureCtrl* mMediaTextureCtrl; | 75 | LLTextureCtrl* mMediaTextureCtrl; |
81 | LLCheckBoxCtrl* mMediaAutoScaleCheck; | 76 | LLCheckBoxCtrl* mMediaAutoScaleCheck; |
@@ -83,17 +78,8 @@ private: | |||
83 | LLCheckBoxCtrl* mMediaUrlCheck; | 78 | LLCheckBoxCtrl* mMediaUrlCheck; |
84 | LLCheckBoxCtrl* mMusicUrlCheck; | 79 | LLCheckBoxCtrl* mMusicUrlCheck; |
85 | LLHandle<LLFloater> mURLEntryFloater; | 80 | LLHandle<LLFloater> mURLEntryFloater; |
86 | LLCheckBoxCtrl* mMediaNavigateAllowCheck; | ||
87 | LLCheckBoxCtrl* mMediaURLFilterCheck; | ||
88 | LLLineEditor* mMediaURLFilterDomainEdit; | ||
89 | LLButton* mMediaURLFilterAddButton; | ||
90 | LLButton* mMediaURLFilterRemoveButton; | ||
91 | LLScrollListCtrl* mURLFilterList; | ||
92 | LLRadioGroup* mRadioNavigateControl; | ||
93 | |||
94 | 81 | ||
95 | |||
96 | LLSafeHandle<LLParcelSelection>& mParcel; | 82 | LLSafeHandle<LLParcelSelection>& mParcel; |
97 | }; | 83 | }; |
98 | 84 | ||
99 | #endif | 85 | #endif \ No newline at end of file |