aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2012-01-12 17:52:29 +0000
committerMelanie2012-01-12 17:52:29 +0000
commit4492bc1bcd055ab5b6f187612462b14b6494fea9 (patch)
tree168e808c3931efc0e05f05ae60aafda6f0a4e946 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentRemove ViewObjectInventory method unsupported by core (diff)
parentAllow update of stored entries within User Management Module-this is needed f... (diff)
downloadopensim-SC_OLD-4492bc1bcd055ab5b6f187612462b14b6494fea9.zip
opensim-SC_OLD-4492bc1bcd055ab5b6f187612462b14b6494fea9.tar.gz
opensim-SC_OLD-4492bc1bcd055ab5b6f187612462b14b6494fea9.tar.bz2
opensim-SC_OLD-4492bc1bcd055ab5b6f187612462b14b6494fea9.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index c45cfb8..193ef0d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -405,7 +405,7 @@ namespace OpenSim.Region.Framework.Scenes
405 405
406 private string m_creatorData = string.Empty; 406 private string m_creatorData = string.Empty;
407 /// <summary> 407 /// <summary>
408 /// Data about the creator in the form profile_url;name 408 /// Data about the creator in the form home_url;name
409 /// </summary> 409 /// </summary>
410 public string CreatorData 410 public string CreatorData
411 { 411 {
@@ -416,7 +416,7 @@ namespace OpenSim.Region.Framework.Scenes
416 /// <summary> 416 /// <summary>
417 /// Used by the DB layer to retrieve / store the entire user identification. 417 /// Used by the DB layer to retrieve / store the entire user identification.
418 /// The identification can either be a simple UUID or a string of the form 418 /// The identification can either be a simple UUID or a string of the form
419 /// uuid[;profile_url[;name]] 419 /// uuid[;home_url[;name]]
420 /// </summary> 420 /// </summary>
421 public string CreatorIdentification 421 public string CreatorIdentification
422 { 422 {