Second Life viewer sources 1.21.0-RC

1 files changed, 4 insertions, 3 deletions

diff --git a/linden/indra/llmath/lluuid.h b/linden/indra/llcommon/lluuid.h
index 48308f2..3b057fb 100644
--- a/linden/indra/llmath/lluuid.h
+++ b/linden/indra/llcommon/lluuid.h
@@ -64,7 +64,7 @@ public:
         // MANIPULATORS
         //
         void    generate();                                     // Generate a new UUID
-        void    generate(std::string stream); //Generate a new UUID based on hash of input stream
+        void    generate(const std::string& stream); //Generate a new UUID based on hash of input stream
         BOOL    set(const char *in_string, BOOL emit = TRUE);   // Convert from string, if emit is FALSE, do not emit warnings
         BOOL    set(const std::string& in_string, BOOL emit = TRUE);    // Convert from string, if emit is FALSE, do not emit warnings
         void    setNull();                                      // Faster than setting to LLUUID::null.
@@ -106,7 +106,9 @@ public:
         friend std::istream&     operator>>(std::istream& s, LLUUID &uuid);
 
         void toString(char *out) const;         // Does not allocate memory, needs 36 characters (including \0)
+        void toString(std::string& out) const;
         void toCompressedString(char *out) const;       // Does not allocate memory, needs 17 characters (including \0)
+        void toCompressedString(std::string& out) const;
 
         std::string asString() const;
         std::string getString() const;
@@ -115,14 +117,13 @@ public:
         U32 getCRC32() const;
 
         static BOOL validate(const std::string& in_string); // Validate that the UUID string is legal.
-        static BOOL validate(const char *in_string); // Validate that the UUID string is legal.
 
         static const LLUUID null;
 
         static U32 getRandomSeed();
         static S32 getNodeID(unsigned char * node_id);
 
-        static BOOL parseUUID(const char* buf, LLUUID* value);
+        static BOOL parseUUID(const std::string& buf, LLUUID* value);
         
         U8 mData[UUID_BYTES];
 };