diff options
| author | David Seikel | 2011-04-03 23:03:16 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-03 23:03:16 +1000 |
| commit | be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2 (patch) | |
| tree | 342cc5a544940b370a129dcdf93cadb2ef46f06c /linden/indra/newview/llpanellandaudio.h | |
| parent | Push some of the trivial changes from the accountList branch. (diff) | |
| parent | Changed version to Experimental 2011.04.02. (diff) | |
| download | meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.zip meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.gz meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.bz2 meta-impy-be06ecd74c3af1ab5f05a3e4dc543dbee1c7aeb2.tar.xz | |
Merge remote-tracking branch 'jacek/exp' into exp
Conflicts:
.gitignore
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/install.xml
Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llpanellandaudio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanellandaudio.h b/linden/indra/newview/llpanellandaudio.h index 3d5d633..82e27f6 100644 --- a/linden/indra/newview/llpanellandaudio.h +++ b/linden/indra/newview/llpanellandaudio.h | |||
| @@ -55,7 +55,6 @@ private: | |||
| 55 | LLCheckBoxCtrl* mCheckSoundLocal; | 55 | LLCheckBoxCtrl* mCheckSoundLocal; |
| 56 | LLRadioGroup* mRadioVoiceChat; | 56 | LLRadioGroup* mRadioVoiceChat; |
| 57 | LLLineEditor* mMusicURLEdit; | 57 | LLLineEditor* mMusicURLEdit; |
| 58 | LLCheckBoxCtrl* mMusicUrlCheck; | ||
| 59 | 58 | ||
| 60 | LLSafeHandle<LLParcelSelection>& mParcel; | 59 | LLSafeHandle<LLParcelSelection>& mParcel; |
| 61 | }; | 60 | }; |