diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/lldynamictexture.h | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/lldynamictexture.h')
-rw-r--r-- | linden/indra/newview/lldynamictexture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lldynamictexture.h b/linden/indra/newview/lldynamictexture.h index 23b3c64..6069940 100644 --- a/linden/indra/newview/lldynamictexture.h +++ b/linden/indra/newview/lldynamictexture.h | |||
@@ -33,7 +33,6 @@ | |||
33 | #define LL_LLDYNAMICTEXTURE_H | 33 | #define LL_LLDYNAMICTEXTURE_H |
34 | 34 | ||
35 | #include "llgl.h" | 35 | #include "llgl.h" |
36 | #include "linked_lists.h" | ||
37 | #include "llcamera.h" | 36 | #include "llcamera.h" |
38 | #include "llcoord.h" | 37 | #include "llcoord.h" |
39 | #include "llimagegl.h" | 38 | #include "llimagegl.h" |
@@ -84,7 +83,8 @@ protected: | |||
84 | LLCoordGL mOrigin; | 83 | LLCoordGL mOrigin; |
85 | 84 | ||
86 | LLCamera mCamera; | 85 | LLCamera mCamera; |
87 | static LLLinkedList<LLDynamicTexture> sInstances[ LLDynamicTexture::ORDER_COUNT ]; | 86 | typedef std::set<LLDynamicTexture*> instance_list_t; |
87 | static instance_list_t sInstances[ LLDynamicTexture::ORDER_COUNT ]; | ||
88 | static S32 sNumRenders; | 88 | static S32 sNumRenders; |
89 | }; | 89 | }; |
90 | 90 | ||