diff options
| author | Aleric Inglewood <Aleric.Inglewood@gmail.com> | 2010-12-30 14:53:30 +0100 |
|---|---|---|
| committer | Aleric Inglewood <Aleric.Inglewood@gmail.com> | 2010-12-30 14:53:30 +0100 |
| commit | 953104660944345c0531b2b2f49bfaf09348d44c (patch) | |
| tree | ef5b993902a60edff931353b631466a8c3d3fe25 /indra/llcommon/lllslconstants.h | |
| parent | e82fb8c7b90c0f5038c38a1aaf4882718433bfd6 (diff) | |
STORM-955: VWR-24312: Massively duplicated objects
Turns out that most of my SNOW-800 patch was included in Viewer 2 (albeit without crediting me).
However, not everything was used and some more cleaning up was possible.
After this patch, and when compiling with optimization, there are no duplicates left
anymore that shouldn't be there in the first place. Apart from the debug stream
iostream guard variable, there are several static variables with the same name (r, r1,
r2, etc) but that indeed actually different symbol objects. Then there are a few
constant POD arrays that are duplicated a hand full of times because they are
accessed with a variable index (so optimizing them away is not possible). I left them
like that (although defining those as extern as well would have been more consistent
and not slower; in fact it would be faster theoretically because those arrays could
share the same cache page then).
Diffstat (limited to 'indra/llcommon/lllslconstants.h')
| -rw-r--r-- | indra/llcommon/lllslconstants.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lllslconstants.h b/indra/llcommon/lllslconstants.h index 539c807020..9f32598e61 100644 --- a/indra/llcommon/lllslconstants.h +++ b/indra/llcommon/lllslconstants.h @@ -181,7 +181,7 @@ const S32 OBJECT_GROUP = 7; const S32 OBJECT_CREATOR = 8; // llTextBox() magic token string - yes this is a hack. sue me. -const std::string TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!"; +char const* const TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!"; // changed() event flags const U32 CHANGED_NONE = 0x0; |