diff options
| author | Don Kjer <don@lindenlab.com> | 2013-03-13 08:46:59 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-03-13 08:46:59 +0000 |
| commit | 662d67e3b5f1cbf5e894f0e4af37a31faacd67e3 (patch) | |
| tree | 93af533d9c1e9c027c5abc56a5de4ee207591b23 /indra/llappearance | |
| parent | f945415210f0e18c2c6d941fda6b7d45cb0f06f1 (diff) | |
| parent | 0ebcdce82bffae18459ed541f05906f625ef47e2 (diff) | |
Merging LLCURL::Responder changes with CHUI changes. Fixed gcc 4.6 compile failures
Diffstat (limited to 'indra/llappearance')
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llavatarappearance.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llavatarappearance.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llavatarjointmesh.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llavatarjointmesh.h | 0 | ||||
| -rw-r--r-- | indra/llappearance/lltexlayer.cpp | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/lltexlayerparams.cpp | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llwearable.cpp | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llwearabledata.cpp | 0 |
8 files changed, 6 insertions, 6 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 2d5744bb5e..2d5744bb5e 100755..100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h index bce2540258..bce2540258 100755..100644 --- a/indra/llappearance/llavatarappearance.h +++ b/indra/llappearance/llavatarappearance.h diff --git a/indra/llappearance/llavatarjointmesh.cpp b/indra/llappearance/llavatarjointmesh.cpp index 4a5cff1dc3..4a5cff1dc3 100755..100644 --- a/indra/llappearance/llavatarjointmesh.cpp +++ b/indra/llappearance/llavatarjointmesh.cpp diff --git a/indra/llappearance/llavatarjointmesh.h b/indra/llappearance/llavatarjointmesh.h index 6486932cdf..6486932cdf 100755..100644 --- a/indra/llappearance/llavatarjointmesh.h +++ b/indra/llappearance/llavatarjointmesh.h diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index 3c23f5f293..f951a982e5 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -38,7 +38,7 @@ #include "llvfs.h" #include "lltexlayerparams.h" #include "lltexturemanagerbridge.h" -#include "llrender2dutils.h" +#include "../llui/llui.h" #include "llwearable.h" #include "llwearabledata.h" #include "llvertexbuffer.h" diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp index 64b3b62185..6aae9a8cc1 100755..100644 --- a/indra/llappearance/lltexlayerparams.cpp +++ b/indra/llappearance/lltexlayerparams.cpp @@ -33,7 +33,7 @@ #include "llquantize.h" #include "lltexlayer.h" #include "lltexturemanagerbridge.h" -#include "llrender2dutils.h" +#include "../llui/llui.h" #include "llwearable.h" //----------------------------------------------------------------------------- diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp index 4028c1dfad..d86a460511 100755..100644 --- a/indra/llappearance/llwearable.cpp +++ b/indra/llappearance/llwearable.cpp @@ -81,13 +81,13 @@ BOOL LLWearable::exportStream( std::ostream& output_stream ) const output_stream << mDescription << "\n"; // permissions - if( !mPermissions.exportStream( output_stream ) ) + if( !mPermissions.exportLegacyStream( output_stream ) ) { return FALSE; } // sale info - if( !mSaleInfo.exportStream( output_stream ) ) + if( !mSaleInfo.exportLegacyStream( output_stream ) ) { return FALSE; } @@ -263,7 +263,7 @@ LLWearable::EImportResult LLWearable::importStream( std::istream& input_stream, llwarns << "Bad Wearable asset: missing valid permissions" << llendl; return LLWearable::FAILURE; } - if( !mPermissions.importStream( input_stream ) ) + if( !mPermissions.importLegacyStream( input_stream ) ) { return LLWearable::FAILURE; } @@ -288,7 +288,7 @@ LLWearable::EImportResult LLWearable::importStream( std::istream& input_stream, // up the vast majority of the tasks. BOOL has_perm_mask = FALSE; U32 perm_mask = 0; - if( !mSaleInfo.importStream(input_stream, has_perm_mask, perm_mask) ) + if( !mSaleInfo.importLegacyStream(input_stream, has_perm_mask, perm_mask) ) { return LLWearable::FAILURE; } diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp index 68fdcca782..68fdcca782 100755..100644 --- a/indra/llappearance/llwearabledata.cpp +++ b/indra/llappearance/llwearabledata.cpp |