aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/lluuid.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcommon/lluuid.h')
-rw-r--r--linden/indra/llcommon/lluuid.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/llcommon/lluuid.h b/linden/indra/llcommon/lluuid.h
index 876941f..4b32138 100644
--- a/linden/indra/llcommon/lluuid.h
+++ b/linden/indra/llcommon/lluuid.h
@@ -16,7 +16,8 @@
16 * There are special exceptions to the terms and conditions of the GPL as 16 * There are special exceptions to the terms and conditions of the GPL as
17 * it is applied to this Source Code. View the full text of the exception 17 * it is applied to this Source Code. View the full text of the exception
18 * in the file doc/FLOSS-exception.txt in this software distribution, or 18 * in the file doc/FLOSS-exception.txt in this software distribution, or
19 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 19 * online at
20 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
20 * 21 *
21 * By copying, modifying or distributing this software, you acknowledge 22 * By copying, modifying or distributing this software, you acknowledge
22 * that you have read and understood your obligations described above, 23 * that you have read and understood your obligations described above,
@@ -65,6 +66,9 @@ public:
65 // 66 //
66 void generate(); // Generate a new UUID 67 void generate(); // Generate a new UUID
67 void generate(const std::string& stream); //Generate a new UUID based on hash of input stream 68 void generate(const std::string& stream); //Generate a new UUID based on hash of input stream
69
70 static LLUUID generateNewID(std::string stream = ""); //static version of above for use in initializer expressions such as constructor params, etc.
71
68 BOOL set(const char *in_string, BOOL emit = TRUE); // Convert from string, if emit is FALSE, do not emit warnings 72 BOOL set(const char *in_string, BOOL emit = TRUE); // Convert from string, if emit is FALSE, do not emit warnings
69 BOOL set(const std::string& in_string, BOOL emit = TRUE); // Convert from string, if emit is FALSE, do not emit warnings 73 BOOL set(const std::string& in_string, BOOL emit = TRUE); // Convert from string, if emit is FALSE, do not emit warnings
70 void setNull(); // Faster than setting to LLUUID::null. 74 void setNull(); // Faster than setting to LLUUID::null.
@@ -124,7 +128,7 @@ public:
124 static S32 getNodeID(unsigned char * node_id); 128 static S32 getNodeID(unsigned char * node_id);
125 129
126 static BOOL parseUUID(const std::string& buf, LLUUID* value); 130 static BOOL parseUUID(const std::string& buf, LLUUID* value);
127 131
128 U8 mData[UUID_BYTES]; 132 U8 mData[UUID_BYTES];
129}; 133};
130 134