diff options
author | Armin Weatherwax | 2011-04-26 20:04:01 +0200 |
---|---|---|
committer | Armin Weatherwax | 2011-05-17 07:49:58 +0200 |
commit | 9a234248ac3a813ee5429eafe30b069161f37d0a (patch) | |
tree | b15e25da9bcb9ec8081aa1e8a73c277e1c4cf833 /linden/indra/llplugin | |
parent | Don't crash at the attempt to import clothing/bodyparts in file > import object (diff) | |
download | meta-impy-9a234248ac3a813ee5429eafe30b069161f37d0a.zip meta-impy-9a234248ac3a813ee5429eafe30b069161f37d0a.tar.gz meta-impy-9a234248ac3a813ee5429eafe30b069161f37d0a.tar.bz2 meta-impy-9a234248ac3a813ee5429eafe30b069161f37d0a.tar.xz |
send plugin messages with in notation format instead of xml
sideffect: media volume updates work on linuces where they failed.
Diffstat (limited to 'linden/indra/llplugin')
-rwxr-xr-x | linden/indra/llplugin/llpluginmessage.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/linden/indra/llplugin/llpluginmessage.cpp b/linden/indra/llplugin/llpluginmessage.cpp index 0810a04..9c4940a 100755 --- a/linden/indra/llplugin/llpluginmessage.cpp +++ b/linden/indra/llplugin/llpluginmessage.cpp | |||
@@ -368,7 +368,8 @@ std::string LLPluginMessage::generate(void) const | |||
368 | 368 | ||
369 | // Pretty XML may be slightly easier to deal with while debugging... | 369 | // Pretty XML may be slightly easier to deal with while debugging... |
370 | // LLSDSerialize::toXML(mMessage, result); | 370 | // LLSDSerialize::toXML(mMessage, result); |
371 | LLSDSerialize::toPrettyXML(mMessage, result); | 371 | // LLSDSerialize::toPrettyXML(mMessage, result); |
372 | result << mMessage; | ||
372 | 373 | ||
373 | return result.str(); | 374 | return result.str(); |
374 | } | 375 | } |
@@ -383,10 +384,12 @@ int LLPluginMessage::parse(const std::string &message) | |||
383 | // clear any previous state | 384 | // clear any previous state |
384 | clear(); | 385 | clear(); |
385 | 386 | ||
386 | std::istringstream input(message); | 387 | std::istringstream input(message); |
387 | 388 | ||
388 | S32 parse_result = LLSDSerialize::fromXML(mMessage, input); | 389 | |
389 | 390 | // S32 parse_result = LLSDSerialize::fromXML(test, input); | |
391 | S32 parse_result = LLSDSerialize::fromNotation( mMessage, input, LLSDSerialize::SIZE_UNLIMITED) ; | ||
392 | |||
390 | return (int)parse_result; | 393 | return (int)parse_result; |
391 | } | 394 | } |
392 | 395 | ||