diff options
author | Steven Bennetts <steve@lindenlab.com> | 2007-01-24 20:21:23 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-24 20:21:23 +0000 |
commit | ad94bca0d273869d6358719f4dbd515a905acd26 (patch) | |
tree | 52ae9f056f3dd6a938434d45d5295aef87e77e0a /indra/llinventory/lllandmark.cpp | |
parent | 787ac69d75dbbd8ad79c32a5de54603351523eae (diff) |
merge -r 56696:57082 Branch_1-13-2
Diffstat (limited to 'indra/llinventory/lllandmark.cpp')
-rw-r--r-- | indra/llinventory/lllandmark.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llinventory/lllandmark.cpp b/indra/llinventory/lllandmark.cpp index a99bd42344..00d373cf02 100644 --- a/indra/llinventory/lllandmark.cpp +++ b/indra/llinventory/lllandmark.cpp @@ -119,10 +119,12 @@ LLLandmark* LLLandmark::constructFromString(const char *buffer) } else if(version == 2) { + // *NOTE: Changing the buffer size will require changing the + // scanf call below. char region_id_str[MAX_STRING]; LLVector3 pos; cur += chars_read; - count = sscanf(cur, "region_id %s\n%n", region_id_str, &chars_read); + count = sscanf(cur, "region_id %254s\n%n", region_id_str, &chars_read); if(count != 1) goto error; cur += chars_read; count = sscanf(cur, "local_pos %f %f %f\n%n", pos.mV+VX, pos.mV+VY, pos.mV+VZ, &chars_read); |