Merge remote-tracking branch 'shyotl/master'

2011-06-09 18:58:52 +02:00
parent 425e1581ae c57b97c8df
commit bde4826c24
111 changed files with 8200 additions and 6400 deletions
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -101,9 +101,11 @@ set(viewer_SOURCE_FILES
    qtoolalign.cpp
    llagent.cpp
    llagentaccess.cpp
+    llagentcamera.cpp
    llagentdata.cpp
    llagentlanguage.cpp
    llagentpilot.cpp
+    llagentwearables.cpp
    llanimstatelabels.cpp
    llappviewer.cpp
    llassetconverter.cpp
@@ -574,9 +576,11 @@ set(viewer_HEADER_FILES
    qtoolalign.h
    llagent.h
    llagentaccess.h
+    llagentcamera.h
    llagentdata.h
    llagentlanguage.h
    llagentpilot.h
+    llagentwearables.h
    llanimstatelabels.h
    llappearance.h
    llappviewer.h