Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into VoiceUpdate

2013-06-11 05:56:24 -04:00
parent c8657504f6 edf8c337ee
commit 62a96b8b33
23 changed files with 510 additions and 28 deletions
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -79,6 +79,7 @@ include_directories(

 set(viewer_SOURCE_FILES
    NACLantispam.cpp
+    aihttpview.cpp
    aoremotectrl.cpp
    ascentfloatercontactgroups.cpp
    ascentkeyword.cpp
@@ -582,6 +583,7 @@ set(viewer_HEADER_FILES
    ViewerInstall.cmake

    NACLantispam.h
+    aihttpview.h
    aoremotectrl.h
    ascentfloatercontactgroups.h
    ascentkeyword.h