diff options
| author | Richard Linden <none@none> | 2013-04-24 14:13:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-24 14:13:45 -0700 |
| commit | 84af0e9852486231b5ef0cde7ad1704d41689a3a (patch) | |
| tree | e4049f49451f9f4539a605af4d1976f35f129c3f /indra/newview | |
| parent | c6737163854981d94fde8bdd440eaf4bbc816b4f (diff) | |
SH-4080 WIP interesting: random crash on Mac
potential fix for crasher
cleaned up llsingleton
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltoolselect.h | 2 | ||||
| -rw-r--r-- | indra/newview/llviewertexturelist.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltoolselect.h b/indra/newview/lltoolselect.h index baa27f6071..74dababe8c 100644 --- a/indra/newview/lltoolselect.h +++ b/indra/newview/lltoolselect.h @@ -34,7 +34,7 @@ class LLObjectSelection; -class LLToolSelect : public LLTool, public LLSingleton<LLToolSelect> +class LLToolSelect : public LLTool { public: LLToolSelect( LLToolComposite* composite ); diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h index e3df71cca2..7ce4a8fc70 100644 --- a/indra/newview/llviewertexturelist.h +++ b/indra/newview/llviewertexturelist.h @@ -34,6 +34,7 @@ #include "llui.h" #include <list> #include <set> +#include "lluiimage.h" const U32 LL_IMAGE_REZ_LOSSLESS_CUTOFF = 128; |