diff options
| author | Robert Adams | 2013-05-21 15:31:13 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-05-21 15:31:13 -0700 |
| commit | ece7b33a963081a217351a640f9780219cc5cbd6 (patch) | |
| tree | 9a986669b22ad72611da98582e052601c279559d /OpenSim/Framework/Util.cs | |
| parent | BulletSim: fix BulletSim crashing if there is no [BulletSim] section (diff) | |
| parent | To further help with tracking down the apperance of too much "Unknown User" i... (diff) | |
| download | opensim-SC_OLD-ece7b33a963081a217351a640f9780219cc5cbd6.zip opensim-SC_OLD-ece7b33a963081a217351a640f9780219cc5cbd6.tar.gz opensim-SC_OLD-ece7b33a963081a217351a640f9780219cc5cbd6.tar.bz2 opensim-SC_OLD-ece7b33a963081a217351a640f9780219cc5cbd6.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index a3602e9..ada4e89 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -2136,7 +2136,7 @@ namespace OpenSim.Framework | |||
| 2136 | /// <param name="secret">the secret part</param> | 2136 | /// <param name="secret">the secret part</param> |
| 2137 | public static bool ParseUniversalUserIdentifier(string value, out UUID uuid, out string url, out string firstname, out string lastname, out string secret) | 2137 | public static bool ParseUniversalUserIdentifier(string value, out UUID uuid, out string url, out string firstname, out string lastname, out string secret) |
| 2138 | { | 2138 | { |
| 2139 | uuid = UUID.Zero; url = string.Empty; firstname = "Unknown"; lastname = "User"; secret = string.Empty; | 2139 | uuid = UUID.Zero; url = string.Empty; firstname = "Unknown"; lastname = "UserUPUUI"; secret = string.Empty; |
| 2140 | 2140 | ||
| 2141 | string[] parts = value.Split(';'); | 2141 | string[] parts = value.Split(';'); |
| 2142 | if (parts.Length >= 1) | 2142 | if (parts.Length >= 1) |