diff options
Diffstat (limited to 'linden/indra/newview/llfloaterpreference.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterpreference.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp index c468a5e..744c179 100644 --- a/linden/indra/newview/llfloaterpreference.cpp +++ b/linden/indra/newview/llfloaterpreference.cpp | |||
@@ -49,7 +49,6 @@ | |||
49 | #include "message.h" | 49 | #include "message.h" |
50 | 50 | ||
51 | #include "llcommandhandler.h" | 51 | #include "llcommandhandler.h" |
52 | #include "llfloaterabout.h" | ||
53 | #include "llfloaterpreference.h" | 52 | #include "llfloaterpreference.h" |
54 | #include "llpanelnetwork.h" | 53 | #include "llpanelnetwork.h" |
55 | #include "llpanelaudioprefs.h" | 54 | #include "llpanelaudioprefs.h" |
@@ -353,7 +352,6 @@ LLFloaterPreference::LLFloaterPreference() | |||
353 | 352 | ||
354 | BOOL LLFloaterPreference::postBuild() | 353 | BOOL LLFloaterPreference::postBuild() |
355 | { | 354 | { |
356 | requires<LLButton>("About..."); | ||
357 | requires<LLButton>("OK"); | 355 | requires<LLButton>("OK"); |
358 | requires<LLButton>("Cancel"); | 356 | requires<LLButton>("Cancel"); |
359 | requires<LLButton>("Apply"); | 357 | requires<LLButton>("Apply"); |
@@ -363,9 +361,6 @@ BOOL LLFloaterPreference::postBuild() | |||
363 | { | 361 | { |
364 | return FALSE; | 362 | return FALSE; |
365 | } | 363 | } |
366 | |||
367 | mAboutBtn = getChild<LLButton>("About..."); | ||
368 | mAboutBtn->setClickedCallback(onClickAbout, this); | ||
369 | 364 | ||
370 | mApplyBtn = getChild<LLButton>("Apply"); | 365 | mApplyBtn = getChild<LLButton>("Apply"); |
371 | mApplyBtn->setClickedCallback(onBtnApply, this); | 366 | mApplyBtn->setClickedCallback(onBtnApply, this); |
@@ -430,13 +425,6 @@ void LLFloaterPreference::show(void*) | |||
430 | } | 425 | } |
431 | 426 | ||
432 | 427 | ||
433 | // static | ||
434 | void LLFloaterPreference::onClickAbout(void*) | ||
435 | { | ||
436 | LLFloaterAbout::show(NULL); | ||
437 | } | ||
438 | |||
439 | |||
440 | // static | 428 | // static |
441 | void LLFloaterPreference::onBtnOK( void* userdata ) | 429 | void LLFloaterPreference::onBtnOK( void* userdata ) |
442 | { | 430 | { |