Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

indra/newview/CMakeLists.txt

@@ -109,6 +109,7 @@ set(viewer_SOURCE_FILES
     lggdicdownload.cpp
     lgghunspell_wrapper.cpp
     llaccountingcostmanager.cpp
+    llaisapi.cpp
     llagent.cpp
     llagentaccess.cpp
     llagentcamera.cpp
@@ -296,6 +297,7 @@ set(viewer_SOURCE_FILES
     llgroupnotify.cpp
     llhomelocationresponder.cpp
     llhoverview.cpp
+    llhttpretrypolicy.cpp
     llhudeffect.cpp
     llhudeffectbeam.cpp
     llhudeffectlookat.cpp
@@ -521,6 +523,7 @@ set(viewer_SOURCE_FILES
     llviewerobject.cpp
     llviewerobjectbackup.cpp
     llviewerobjectlist.cpp
+    llvieweroctree.cpp
     llviewerparcelmedia.cpp
     llviewerparcelmediaautoplay.cpp
     llviewerparcelmgr.cpp
@@ -638,6 +641,7 @@ set(viewer_HEADER_FILES
     lggdicdownload.h
     lgghunspell_wrapper.h
     llaccountingcostmanager.h
+    llaisapi.h
     llagent.h
     llagentaccess.h
     llagentcamera.h
@@ -824,6 +828,7 @@ set(viewer_HEADER_FILES
     llgroupactions.h
     llgroupmgr.h
     llgroupnotify.h
+    llhttpretrypolicy.h
     llhomelocationresponder.h
     llhoverview.h
     llhudeffect.h
@@ -1055,6 +1060,7 @@ set(viewer_HEADER_FILES
     llviewerobject.h
     llviewerobjectbackup.h
     llviewerobjectlist.h
+    llvieweroctree.h
     llviewerparcelmedia.h
     llviewerparcelmediaautoplay.h
     llviewerparcelmgr.h