diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llimage/llimage.h | 8 |
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; | |||
49 | const S32 MAX_IMAGE_COMPONENTS = 8; | 49 | const S32 MAX_IMAGE_COMPONENTS = 8; |
50 | const S32 MAX_IMAGE_DATA_SIZE = MAX_IMAGE_AREA * MAX_IMAGE_COMPONENTS; | 50 | const 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 | ||
53 | const S32 FIRST_PACKET_SIZE = 600; | 54 | const S32 FIRST_PACKET_SIZE = 600; |
54 | const S32 MAX_IMG_PACKET_SIZE = 1000; | 55 | const S32 MAX_IMG_PACKET_SIZE = 1000; |
55 | 56 | ||
@@ -60,7 +61,6 @@ const S32 MAX_IMG_PACKET_SIZE = 1000; | |||
60 | class LLImageFormatted; | 61 | class LLImageFormatted; |
61 | class LLImageRaw; | 62 | class LLImageRaw; |
62 | class LLColor4U; | 63 | class LLColor4U; |
63 | class LLWorkerThread; | ||
64 | 64 | ||
65 | typedef enum e_image_codec | 65 | typedef enum e_image_codec |
66 | { | 66 | { |
@@ -81,7 +81,7 @@ typedef enum e_image_codec | |||
81 | class LLImage | 81 | class LLImage |
82 | { | 82 | { |
83 | public: | 83 | public: |
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: | |||
309 | protected: | 309 | protected: |
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 | ||
315 | public: | 315 | public: |