aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorDiva Canto2010-11-21 13:16:52 -0800
committerDiva Canto2010-11-21 13:16:52 -0800
commit6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1 (patch)
tree6668ec7fc7816fb0fbe3793ac0967504d2f8c5ce /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentFix global region coordinates that are delivered by llRequestSimulatorData. (diff)
downloadopensim-SC_OLD-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.zip
opensim-SC_OLD-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.tar.gz
opensim-SC_OLD-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.tar.bz2
opensim-SC_OLD-6a9ae9e7cb71d79e9ec06cf25009e8bf45850dd1.tar.xz
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs51
1 files changed, 51 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index f164201..6d5a53a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -435,6 +435,7 @@ namespace OpenSim.Region.Framework.Scenes
435 private DateTime m_expires; 435 private DateTime m_expires;
436 private DateTime m_rezzed; 436 private DateTime m_rezzed;
437 private bool m_createSelected = false; 437 private bool m_createSelected = false;
438 private string m_creatorData = string.Empty;
438 439
439 public UUID CreatorID 440 public UUID CreatorID
440 { 441 {
@@ -448,6 +449,56 @@ namespace OpenSim.Region.Framework.Scenes
448 } 449 }
449 } 450 }
450 451
452 public string CreatorData
453 {
454 get { return m_creatorData; }
455 set { m_creatorData = value; }
456 }
457
458 public string CreatorIdentification
459 {
460 get
461 {
462 if (m_creatorData != null && m_creatorData != string.Empty)
463 return _creatorID.ToString() + ';' + m_creatorData;
464 else
465 return _creatorID.ToString();
466 }
467 set
468 {
469 if ((value == null) || (value != null && value == string.Empty))
470 {
471 m_creatorData = string.Empty;
472 return;
473 }
474
475 if (!value.Contains(";")) // plain UUID
476 {
477 UUID uuid = UUID.Zero;
478 UUID.TryParse(value, out uuid);
479 _creatorID = uuid;
480 }
481 else // <uuid>[;<endpoint>[;name]]
482 {
483 string name = "Unknown User";
484 string[] parts = value.Split(';');
485 if (parts.Length >= 1)
486 {
487 UUID uuid = UUID.Zero;
488 UUID.TryParse(parts[0], out uuid);
489 _creatorID = uuid;
490 }
491 if (parts.Length >= 2)
492 m_creatorData = parts[1];
493 if (parts.Length >= 3)
494 name = parts[2];
495
496 m_creatorData += ';' + name;
497
498 }
499 }
500 }
501
451 /// <summary> 502 /// <summary>
452 /// A relic from when we we thought that prims contained folder objects. In 503 /// A relic from when we we thought that prims contained folder objects. In
453 /// reality, prim == folder 504 /// reality, prim == folder