diff options
author | Justin Clark-Casey (justincc) | 2012-01-12 19:03:26 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-12 19:03:26 +0000 |
commit | 0a1d61950b326abffbcc0b9fe763e1cc6351acf6 (patch) | |
tree | 934c0e80e5103c871fdf19f90ee50e0175d14895 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() meth... (diff) | |
parent | Renamed one var and deleted commented code. No functional changes. (diff) | |
download | opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.zip opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.gz opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.bz2 opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 51d3586..e9c33eb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -394,7 +394,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
394 | 394 | ||
395 | private string m_creatorData = string.Empty; | 395 | private string m_creatorData = string.Empty; |
396 | /// <summary> | 396 | /// <summary> |
397 | /// Data about the creator in the form profile_url;name | 397 | /// Data about the creator in the form home_url;name |
398 | /// </summary> | 398 | /// </summary> |
399 | public string CreatorData | 399 | public string CreatorData |
400 | { | 400 | { |
@@ -405,7 +405,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
405 | /// <summary> | 405 | /// <summary> |
406 | /// Used by the DB layer to retrieve / store the entire user identification. | 406 | /// Used by the DB layer to retrieve / store the entire user identification. |
407 | /// The identification can either be a simple UUID or a string of the form | 407 | /// The identification can either be a simple UUID or a string of the form |
408 | /// uuid[;profile_url[;name]] | 408 | /// uuid[;home_url[;name]] |
409 | /// </summary> | 409 | /// </summary> |
410 | public string CreatorIdentification | 410 | public string CreatorIdentification |
411 | { | 411 | { |