Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

This commit is contained in:
Lirusaito
2013-06-24 14:22:36 -04:00
7 changed files with 235 additions and 64 deletions

View File

@@ -170,6 +170,7 @@
#include "llfloatermessagelog.h"
#include "shfloatermediaticker.h"
#include "llpacketring.h"
#include "aihttpview.h"
// </edit>
#include "scriptcounter.h"
@@ -819,7 +820,7 @@ void init_client_menu(LLMenuGL* menu)
}
sub->addChild(new LLMenuItemCheckGL("HTTP Console",
&toggle_visibility,
&AIHTTPView::toggle_visibility,
NULL,
&get_visibility,
(void*)gHttpView,