aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage/llimage.h
diff options
context:
space:
mode:
authorJacek Antonelli2010-02-09 21:11:42 -0600
committerJacek Antonelli2010-02-16 18:50:15 -0600
commite6247fbe78c4d3dacb74f3b2359aba2b6538133b (patch)
tree10c42d670a2c635b4339f7f68809c221756774f8 /linden/indra/llimage/llimage.h
parentPorted some cURL and HTTP-related changes from Snowglobe. (diff)
downloadmeta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.zip
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.gz
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.bz2
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.xz
Ported many texture engine changes from Snowglobe.
Diffstat (limited to '')
-rw-r--r--linden/indra/llimage/llimage.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index bd609b6..be2eb08 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -49,7 +49,8 @@ const S32 MAX_IMAGE_AREA = MAX_IMAGE_SIZE * MAX_IMAGE_SIZE;
49const S32 MAX_IMAGE_COMPONENTS = 8; 49const S32 MAX_IMAGE_COMPONENTS = 8;
50const S32 MAX_IMAGE_DATA_SIZE = MAX_IMAGE_AREA * MAX_IMAGE_COMPONENTS; 50const S32 MAX_IMAGE_DATA_SIZE = MAX_IMAGE_AREA * MAX_IMAGE_COMPONENTS;
51 51
52// Note! These CANNOT be changed without invalidating the viewer VFS files, I think? 52// Note! These CANNOT be changed without modifying simulator code
53// *TODO: change both to 1024 when SIM texture fetching is deprecated
53const S32 FIRST_PACKET_SIZE = 600; 54const S32 FIRST_PACKET_SIZE = 600;
54const S32 MAX_IMG_PACKET_SIZE = 1000; 55const S32 MAX_IMG_PACKET_SIZE = 1000;
55 56
@@ -60,7 +61,6 @@ const S32 MAX_IMG_PACKET_SIZE = 1000;
60class LLImageFormatted; 61class LLImageFormatted;
61class LLImageRaw; 62class LLImageRaw;
62class LLColor4U; 63class LLColor4U;
63class LLWorkerThread;
64 64
65typedef enum e_image_codec 65typedef enum e_image_codec
66{ 66{
@@ -81,7 +81,7 @@ typedef enum e_image_codec
81class LLImage 81class LLImage
82{ 82{
83public: 83public:
84 static void initClass(LLWorkerThread* workerthread); 84 static void initClass();
85 static void cleanupClass(); 85 static void cleanupClass();
86 86
87 static const std::string& getLastError(); 87 static const std::string& getLastError();
@@ -309,7 +309,7 @@ protected:
309protected: 309protected:
310 S8 mCodec; 310 S8 mCodec;
311 S8 mDecoding; 311 S8 mDecoding;
312 S8 mDecoded; 312 S8 mDecoded; // unused, but changing LLImage layout requires recompiling static Mac/Linux libs. 2009-01-30 JC
313 S8 mDiscardLevel; 313 S8 mDiscardLevel;
314 314
315public: 315public: