From a2e22732f195dc075a733c79f15156752f522a43 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 30 Jul 2013 19:13:45 -0700
Subject: Summer cleaning - removed a lot of llcommon dependencies to speed up
build times consolidated most indra-specific constants in llcommon under
indra_constants.h fixed issues with operations on mixed unit types (implicit
and explicit) made LL_INFOS() style macros variadic in order to subsume other
logging methods such as ll_infos added optional tag output to error recorders
---
indra/newview/llvoavatarself.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/newview/llvoavatarself.h')
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 3b7b6bac64..be98f8dfa9 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -30,6 +30,7 @@
#include "llviewertexture.h"
#include "llvoavatar.h"
+#include <map>
struct LocalTextureData;
@@ -276,8 +277,7 @@ public:
static void deleteScratchTextures();
private:
static S32 sScratchTexBytes;
- static LLMap< LLGLenum, LLGLuint*> sScratchTexNames;
- static LLMap< LLGLenum, F32*> sScratchTexLastBindTime;
+ static std::map< LLGLenum, LLGLuint*> sScratchTexNames;
/** Textures
** **
--
cgit v1.2.3
From 612892b45a3413b16e40c49d3bfde77a4ca927fd Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Sun, 18 Aug 2013 22:30:27 -0700
Subject: SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
continued conversion to units system made units perform type promotion
correctly and preserve type in arithmetic e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
---
indra/newview/llvoavatarself.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/newview/llvoavatarself.h')
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index be98f8dfa9..9e9e2b61d7 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -276,7 +276,7 @@ public:
public:
static void deleteScratchTextures();
private:
- static S32 sScratchTexBytes;
+ static S32Bytes sScratchTexBytes;
static std::map< LLGLenum, LLGLuint*> sScratchTexNames;
/** Textures
--
cgit v1.2.3
From 17df8988fec3f2ba991ca9e34ff8148253a2fc04 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 7 Oct 2013 13:38:03 -0700
Subject: renamed TraceType to StatType added more MemTrackable types optimized
memory usage of LLTrace some more
---
indra/newview/llvoavatarself.h | 10 ----------
1 file changed, 10 deletions(-)
(limited to 'indra/newview/llvoavatarself.h')
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 9e9e2b61d7..c280988fd6 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -50,16 +50,6 @@ class LLVOAvatarSelf :
**/
public:
- void* operator new(size_t size)
- {
- return ll_aligned_malloc_16(size);
- }
-
- void operator delete(void* ptr)
- {
- ll_aligned_free_16(ptr);
- }
-
LLVOAvatarSelf(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
virtual ~LLVOAvatarSelf();
virtual void markDead();
--
cgit v1.2.3