diff options
| author | Melanie | 2013-05-24 00:45:08 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-24 00:45:08 +0100 |
| commit | 09c2cd0d76e62cbc7bb2d8b0f21caae901af1681 (patch) | |
| tree | 1856552dd68bfa23877f28842cb00e9e0089d1c4 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: specify directory for OpenSim.Region.Physics.Meshing (diff) | |
| download | opensim-SC-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.zip opensim-SC-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.gz opensim-SC-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.bz2 opensim-SC-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework')
| -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 f520a01..0852b49 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -2148,7 +2148,7 @@ namespace OpenSim.Framework | |||
| 2148 | /// <param name="secret">the secret part</param> | 2148 | /// <param name="secret">the secret part</param> |
| 2149 | public static bool ParseUniversalUserIdentifier(string value, out UUID uuid, out string url, out string firstname, out string lastname, out string secret) | 2149 | public static bool ParseUniversalUserIdentifier(string value, out UUID uuid, out string url, out string firstname, out string lastname, out string secret) |
| 2150 | { | 2150 | { |
| 2151 | uuid = UUID.Zero; url = string.Empty; firstname = "Unknown"; lastname = "User"; secret = string.Empty; | 2151 | uuid = UUID.Zero; url = string.Empty; firstname = "Unknown"; lastname = "UserUPUUI"; secret = string.Empty; |
| 2152 | 2152 | ||
| 2153 | string[] parts = value.Split(';'); | 2153 | string[] parts = value.Split(';'); |
| 2154 | if (parts.Length >= 1) | 2154 | if (parts.Length >= 1) |