aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmutelist.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:48 -0500
committerJacek Antonelli2008-08-15 23:44:48 -0500
commit9b4f54c826ffa4f94efa866068c9d6ecdfb4b424 (patch)
tree2f8ae193ab487088962e628f1ee9dee2f5901f01 /linden/indra/newview/llmutelist.cpp
parentSecond Life viewer sources 1.13.2.12 (diff)
downloadmeta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.zip
meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.gz
meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.bz2
meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.xz
Second Life viewer sources 1.13.2.15
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llmutelist.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 2101e87..fc0046a 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -363,6 +363,8 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
363 return FALSE; 363 return FALSE;
364 } 364 }
365 365
366 // *NOTE: Changing the size of these buffers will require changes
367 // in the scanf below.
366 char id_buffer[MAX_STRING]; 368 char id_buffer[MAX_STRING];
367 char name_buffer[MAX_STRING]; 369 char name_buffer[MAX_STRING];
368 char buffer[MAX_STRING]; 370 char buffer[MAX_STRING];
@@ -372,7 +374,7 @@ BOOL LLMuteList::loadFromFile(const LLString& filename)
372 id_buffer[0] = '\0'; 374 id_buffer[0] = '\0';
373 name_buffer[0] = '\0'; 375 name_buffer[0] = '\0';
374 S32 type = 0; 376 S32 type = 0;
375 sscanf(buffer, " %d %s %[^|]", &type, id_buffer, name_buffer); 377 sscanf(buffer, " %d %254s %254[^|]", &type, id_buffer, name_buffer);
376 LLUUID id = LLUUID(id_buffer); 378 LLUUID id = LLUUID(id_buffer);
377 LLMute mute(id, name_buffer, (LLMute::EType)type); 379 LLMute mute(id, name_buffer, (LLMute::EType)type);
378 if (mute.mID.isNull() 380 if (mute.mID.isNull()