diff options
| author | David Seikel | 2011-05-12 20:36:22 +1000 |
|---|---|---|
| committer | David Seikel | 2011-05-12 20:36:22 +1000 |
| commit | 0311187f308bf24077f0c28243d16c9da8dcf879 (patch) | |
| tree | 55dab1e4b58f114955ffb16ede8d43e73099b1e9 /linden/indra/llrender | |
| parent | Temporary workaround for the "TP over 4096 sims" bug. (diff) | |
| parent | Missed checkin (diff) | |
| download | meta-impy-0311187f308bf24077f0c28243d16c9da8dcf879.zip meta-impy-0311187f308bf24077f0c28243d16c9da8dcf879.tar.gz meta-impy-0311187f308bf24077f0c28243d16c9da8dcf879.tar.bz2 meta-impy-0311187f308bf24077f0c28243d16c9da8dcf879.tar.xz | |
Merge branch 'libotr' into exp
Conflicts:
linden/indra/llmessage/message.cpp
linden/indra/newview/llprefsadvanced.cpp
Diffstat (limited to 'linden/indra/llrender')
| -rw-r--r-- | linden/indra/llrender/llgldbg.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llrender/llgldbg.cpp b/linden/indra/llrender/llgldbg.cpp index c54ab18..0642d3d 100644 --- a/linden/indra/llrender/llgldbg.cpp +++ b/linden/indra/llrender/llgldbg.cpp | |||
| @@ -95,7 +95,7 @@ const char *fv4(F32 *f) | |||
| 95 | const char *fv3(F32 *f) | 95 | const char *fv3(F32 *f) |
| 96 | { | 96 | { |
| 97 | static char str[128]; /* Flawfinder: ignore */ | 97 | static char str[128]; /* Flawfinder: ignore */ |
| 98 | snprintf(str, sizeof(str), "%8.3f, %8.3f, %8.3f", f[0], f[1], f[2]); /* Flawfinder: ignore */ | 98 | ll_snprintf(str, sizeof(str), "%8.3f, %8.3f, %8.3f", f[0], f[1], f[2]); /* Flawfinder: ignore */ |
| 99 | return str; | 99 | return str; |
| 100 | } | 100 | } |
| 101 | 101 | ||
| @@ -105,7 +105,7 @@ const char *fv3(F32 *f) | |||
| 105 | const char *fv1(F32 *f) | 105 | const char *fv1(F32 *f) |
| 106 | { | 106 | { |
| 107 | static char str[128]; /* Flawfinder: ignore */ | 107 | static char str[128]; /* Flawfinder: ignore */ |
| 108 | snprintf(str, sizeof(str), "%8.3f", f[0]); /* Flawfinder: ignore */ | 108 | ll_snprintf(str, sizeof(str), "%8.3f", f[0]); /* Flawfinder: ignore */ |
| 109 | return str; | 109 | return str; |
| 110 | } | 110 | } |
| 111 | 111 | ||