aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
authorOren Hurvitz2013-10-31 13:02:57 +0200
committerOren Hurvitz2014-03-24 18:00:59 +0100
commit89945f8829dcc1ee889aad1bafd1d6c2938a6cc7 (patch)
tree2669a438a473f6b58fd59b10a635662709435bac /OpenSim/Framework/Util.cs
parentWhen updating the CreatorId of an inventory item, automatically update the Cr... (diff)
downloadopensim-SC_OLD-89945f8829dcc1ee889aad1bafd1d6c2938a6cc7.zip
opensim-SC_OLD-89945f8829dcc1ee889aad1bafd1d6c2938a6cc7.tar.gz
opensim-SC_OLD-89945f8829dcc1ee889aad1bafd1d6c2938a6cc7.tar.bz2
opensim-SC_OLD-89945f8829dcc1ee889aad1bafd1d6c2938a6cc7.tar.xz
Refactored: ExternalRepresentationUtils should be the only place where the "CreatorData" field is calculated, to ensure uniformity
Resolves http://opensimulator.org/mantis/view.php?id=6933
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Util.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 5805dc8..c2c9698 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -2250,10 +2250,15 @@ namespace OpenSim.Framework
2250 { 2250 {
2251 string[] parts = firstName.Split(new char[] { '.' }); 2251 string[] parts = firstName.Split(new char[] { '.' });
2252 if (parts.Length == 2) 2252 if (parts.Length == 2)
2253 return id.ToString() + ";" + agentsURI + ";" + parts[0] + " " + parts[1]; 2253 return CalcUniversalIdentifier(id, agentsURI, parts[0] + " " + parts[1]);
2254 } 2254 }
2255 return id.ToString() + ";" + agentsURI + ";" + firstName + " " + lastName; 2255
2256 return CalcUniversalIdentifier(id, agentsURI, firstName + " " + lastName);
2257 }
2256 2258
2259 private static string CalcUniversalIdentifier(UUID id, string agentsURI, string name)
2260 {
2261 return id.ToString() + ";" + agentsURI + ";" + name;
2257 } 2262 }
2258 2263
2259 /// <summary> 2264 /// <summary>