Object textures can now be export and import

2010-06-21 16:12:24 -05:00
parent ad350adbcc
commit 5e7529ee36
10 changed files with 823 additions and 286 deletions
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -801,9 +801,7 @@ void LLUUID::generate()
 #endif
 	if (!has_init) 
 	{
-		// <edit>
-		//if (getNodeID(node_id) <= 0) 
-		// </edit>
+		if (getNodeID(node_id) <= 0) 
 		{
 			get_random_bytes(node_id, 6);
 			/*