diff options
| author | Diva Canto | 2013-05-28 20:59:54 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-05-28 20:59:54 -0700 |
| commit | 233b9ec4d7739f324360366079469f2026c4ce41 (patch) | |
| tree | 61266ac4ceffef23a74bad1dbd15bbe4fd103f82 /OpenSim/Framework/Util.cs | |
| parent | First change in Vivox for ages! -- added a lock to serialize calls to vivox s... (diff) | |
| parent | BulletSim: don't zero motion when changing vehicle type. (diff) | |
| download | opensim-SC_OLD-233b9ec4d7739f324360366079469f2026c4ce41.zip opensim-SC_OLD-233b9ec4d7739f324360366079469f2026c4ce41.tar.gz opensim-SC_OLD-233b9ec4d7739f324360366079469f2026c4ce41.tar.bz2 opensim-SC_OLD-233b9ec4d7739f324360366079469f2026c4ce41.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/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) |