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

2012-02-11 16:58:27 +01:00
parent e10581e319 9f9a4cbaaf
commit aaf1e4d21b
51 changed files with 2262 additions and 1637 deletions
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -129,6 +129,7 @@ set(viewer_SOURCE_FILES
    llassetuploadqueue.cpp
    llattachmentsmgr.cpp
    llaudiosourcevo.cpp
+    llavatarpropertiesprocessor.cpp
    llbox.cpp
    llbuildnewviewsscheduler.cpp
    llcallbacklist.cpp
@@ -614,6 +615,7 @@ set(viewer_HEADER_FILES
    llassetuploadqueue.h
    llattachmentsmgr.h
    llaudiosourcevo.h
+    llavatarpropertiesprocessor.h
    llbox.h
    llbuildnewviewsscheduler.h
    llcallbacklist.h