Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drawable flag fixup. LLCalc cleanup on shutdown.

Browse Source
This commit is contained in:
Shyotl
2011-07-19 20:18:43 -05:00
parent 179c1bcc0c
commit 7a689f5ccb
2 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llappviewer.cpp
View File

@@ -1265,7 +1265,9 @@ bool LLAppViewer::cleanup()
// Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be deleted. // Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be deleted.
LLWorldMap::getInstance()->reset(); // release any images LLWorldMap::getInstance()->reset(); // release any images
LLCalc::cleanUp();
llinfos << "Global stuff deleted" << llendflush; llinfos << "Global stuff deleted" << llendflush;
if (gAudiop) if (gAudiop)

52
indra/newview/lldrawable.h
View File

@@ -250,35 +250,35 @@ public:
typedef enum e_drawable_flags typedef enum e_drawable_flags
{ {
IN_REBUILD_Q1 = 0x00000002, IN_REBUILD_Q1 = 0x00000001,
IN_REBUILD_Q2 = 0x00000004, IN_REBUILD_Q2 = 0x00000002,
IN_LIGHT_Q = 0x00000008, IN_LIGHT_Q = 0x00000004,
EARLY_MOVE = 0x00000010, EARLY_MOVE = 0x00000008,
MOVE_UNDAMPED = 0x00000020, MOVE_UNDAMPED = 0x00000010,
ON_MOVE_LIST = 0x00000040, ON_MOVE_LIST = 0x00000020,
USE_BACKLIGHT = 0x00000080, USE_BACKLIGHT = 0x00000040,
UV = 0x00000100, UV = 0x00000080,
UNLIT = 0x00000200, UNLIT = 0x00000100,
LIGHT = 0x00000400, LIGHT = 0x00000200,
LIGHTING_BUILT = 0x00000800, LIGHTING_BUILT = 0x00000400,
REBUILD_VOLUME = 0x00001000, //volume changed LOD or parameters, or vertex buffer changed REBUILD_VOLUME = 0x00000800, //volume changed LOD or parameters, or vertex buffer changed
REBUILD_TCOORD = 0x00002000, //texture coordinates changed REBUILD_TCOORD = 0x00001000, //texture coordinates changed
REBUILD_COLOR = 0x00004000, //color changed REBUILD_COLOR = 0x00002000, //color changed
REBUILD_POSITION= 0x00010000, //vertex positions/normals changed REBUILD_POSITION= 0x00004000, //vertex positions/normals changed
REBUILD_GEOMETRY= REBUILD_POSITION|REBUILD_TCOORD|REBUILD_COLOR, REBUILD_GEOMETRY= REBUILD_POSITION|REBUILD_TCOORD|REBUILD_COLOR,
REBUILD_MATERIAL= REBUILD_TCOORD|REBUILD_COLOR, REBUILD_MATERIAL= REBUILD_TCOORD|REBUILD_COLOR,
REBUILD_ALL = REBUILD_GEOMETRY|REBUILD_VOLUME, REBUILD_ALL = REBUILD_GEOMETRY|REBUILD_VOLUME,
ON_SHIFT_LIST = 0x00100000, ON_SHIFT_LIST = 0x00010000,
BLOCKER = 0x00400000, BLOCKER = 0x00020000,
ACTIVE = 0x00800000, ACTIVE = 0x00040000,
DEAD = 0x01000000, DEAD = 0x00080000,
INVISIBLE = 0x02000000, // stay invisible until flag is cleared INVISIBLE = 0x00100000, // stay invisible until flag is cleared
NEARBY_LIGHT = 0x04000000, // In gPipeline.mNearbyLightSet NEARBY_LIGHT = 0x00200000, // In gPipeline.mNearbyLightSet
BUILT = 0x08000000, BUILT = 0x00400000,
FORCE_INVISIBLE = 0x10000000, // stay invis until CLEAR_INVISIBLE is set (set of orphaned) FORCE_INVISIBLE = 0x00800000, // stay invis until CLEAR_INVISIBLE is set (set of orphaned)
CLEAR_INVISIBLE = 0x20000000, // clear FORCE_INVISIBLE next draw frame CLEAR_INVISIBLE = 0x01000000, // clear FORCE_INVISIBLE next draw frame
REBUILD_SHADOW = 0x40000000, REBUILD_SHADOW = 0x02000000,
HAS_ALPHA = 0x80000000, HAS_ALPHA = 0x04000000,
PARTITION_MOVE = 0x10000000, PARTITION_MOVE = 0x10000000,
} EDrawableFlags; } EDrawableFlags;