aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llimage/llimagej2c.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-05-07 18:16:10 -0700
committerJacek Antonelli2010-06-19 02:05:24 -0500
commit36b6111ea0b2896134e31c02a87db8687b54ec74 (patch)
tree78241409bd8fd1c91d6be531b17d3baefb80aff5 /linden/indra/llimage/llimagej2c.h
parentAdded some missing entries to the logcontrol.xml debug entries, comment out e... (diff)
downloadmeta-impy-36b6111ea0b2896134e31c02a87db8687b54ec74.zip
meta-impy-36b6111ea0b2896134e31c02a87db8687b54ec74.tar.gz
meta-impy-36b6111ea0b2896134e31c02a87db8687b54ec74.tar.bz2
meta-impy-36b6111ea0b2896134e31c02a87db8687b54ec74.tar.xz
Backported llimage changes from Viewer 2.0.0
Diffstat (limited to '')
-rw-r--r--linden/indra/llimage/llimagej2c.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/llimage/llimagej2c.h b/linden/indra/llimage/llimagej2c.h
index 23f6ef5..74d1256 100644
--- a/linden/indra/llimage/llimagej2c.h
+++ b/linden/indra/llimage/llimagej2c.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$ 5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2001-2009, Linden Research, Inc. 7 * Copyright (c) 2001-2010, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -87,6 +87,10 @@ protected:
87 void updateRawDiscardLevel(); 87 void updateRawDiscardLevel();
88 88
89 S32 mMaxBytes; // Maximum number of bytes of data to use... 89 S32 mMaxBytes; // Maximum number of bytes of data to use...
90
91 S32 mDataSizes[MAX_DISCARD_LEVEL+1]; // Size of data required to reach a given level
92 U32 mAreaUsedForDataSizeCalcs; // Height * width used to calculate mDataSizes
93
90 S8 mRawDiscardLevel; 94 S8 mRawDiscardLevel;
91 F32 mRate; 95 F32 mRate;
92 BOOL mReversible; 96 BOOL mReversible;