diff options
| author | David Walter Seikel | 2012-02-20 22:10:26 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2012-02-20 22:10:26 +1000 |
| commit | ca7fd07f6600f73bd2050c1499e379f7d5038fa9 (patch) | |
| tree | 310d5ab5e3f9d4164b9220a152618bb2ed2162ba /linden/indra/newview/llfloaterchat.h | |
| parent | Support the new WindlightReset message from OpenSim for resetting Windlight p... (diff) | |
| parent | Adding my linux build scripts. Makes it easy to build under 32 and 64 bit li... (diff) | |
| download | meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.zip meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.gz meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.bz2 meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.xz | |
Merge branch 'next' of git://github.com/imprudence/imprudence into next
Conflicts:
linden/indra/newview/installers/windows/meta-impy_installer_template.iss
Branding conflict, fixed.
linden/indra/newview/llviewerwindow.cpp
Already had this change, but merged the minor difference.
Diffstat (limited to 'linden/indra/newview/llfloaterchat.h')
| -rw-r--r-- | linden/indra/newview/llfloaterchat.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterchat.h b/linden/indra/newview/llfloaterchat.h index f8683b9..14c2242 100644 --- a/linden/indra/newview/llfloaterchat.h +++ b/linden/indra/newview/llfloaterchat.h | |||
| @@ -66,7 +66,6 @@ public: | |||
| 66 | virtual void onVisibilityChange(BOOL cur_visibility); | 66 | virtual void onVisibilityChange(BOOL cur_visibility); |
| 67 | virtual void setMinimized(BOOL); | 67 | virtual void setMinimized(BOOL); |
| 68 | void updateConsoleVisibility(); | 68 | void updateConsoleVisibility(); |
| 69 | void updateSettings(); | ||
| 70 | 69 | ||
| 71 | static void setHistoryCursorAndScrollToEnd(); | 70 | static void setHistoryCursorAndScrollToEnd(); |
| 72 | 71 | ||
| @@ -82,7 +81,6 @@ public: | |||
| 82 | 81 | ||
| 83 | static void onClickMute(void *data); | 82 | static void onClickMute(void *data); |
| 84 | static void onClickToggleShowMute(LLUICtrl* caller, void *data); | 83 | static void onClickToggleShowMute(LLUICtrl* caller, void *data); |
| 85 | static void onClickToggleTranslateChat(LLUICtrl* caller, void *data); | ||
| 86 | static void onClickToggleActiveSpeakers(void* userdata); | 84 | static void onClickToggleActiveSpeakers(void* userdata); |
| 87 | static void chatFromLogFile(LLLogChat::ELogLineType type,std::string line, void* userdata); | 85 | static void chatFromLogFile(LLLogChat::ELogLineType type,std::string line, void* userdata); |
| 88 | static void loadHistory(); | 86 | static void loadHistory(); |