V2 llprimitive merge

2011-02-23 01:44:31 -06:00
parent 723fa64f6f
commit 291de90276
12 changed files with 1056 additions and 427 deletions
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -18,11 +18,13 @@ include_directories(
 set(llprimitive_SOURCE_FILES
    llmaterialtable.cpp
    llprimitive.cpp
+    llprimtexturelist.cpp
    lltextureanim.cpp
    lltextureentry.cpp
    lltreeparams.cpp
    llvolumemessage.cpp
    llvolumexml.cpp
+    material_codes.cpp
    )

 set(llprimitive_HEADER_FILES
@@ -31,6 +33,7 @@ set(llprimitive_HEADER_FILES
    legacy_object_types.h
    llmaterialtable.h
    llprimitive.h
+    llprimtexturelist.h
    lltextureanim.h
    lltextureentry.h
    lltreeparams.h