OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-09-21 15:26:30 +01:00
parent 82997c5907 874ba6b363
commit db1e75b0ac
4 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@ -701,6 +701,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
last = parts[1]; last = parts[1];
} }
uui = userID + ";" + homeURL + ";" + first + " " + last; uui = userID + ";" + homeURL + ";" + first + " " + last;
return result;
} }
} }

2
OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
View File

@ -768,7 +768,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
else else
so = m_scene.GetSceneObjectGroup(localId); so = m_scene.GetSceneObjectGroup(localId);
if (!so.IsAttachment) if (so!= null && !so.IsAttachment)
deletes.Add(so); deletes.Add(so);
// if (deletes.Count == 0) // if (deletes.Count == 0)

40
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -537,39 +537,29 @@ namespace OpenSim.Region.Framework.Scenes
} }
set set
{ {
CreatorData = string.Empty;
if ((value == null) || (value != null && value == string.Empty)) if ((value == null) || (value != null && value == string.Empty))
{
CreatorData = string.Empty;
return; return;
}
if (!value.Contains(";")) // plain UUID // value is uuid or uuid;homeuri;firstname lastname
string[] parts = value.Split(';');
if (parts.Length > 0)
{ {
UUID uuid = UUID.Zero; UUID uuid = UUID.Zero;
UUID.TryParse(value, out uuid); UUID.TryParse(parts[0], out uuid);
CreatorID = uuid; CreatorID = uuid;
}
else // <uuid>[;<endpoint>[;name]] if (parts.Length > 1)
{
string name = "Unknown User";
string[] parts = value.Split(';');
if (parts.Length >= 1)
{
UUID uuid = UUID.Zero;
UUID.TryParse(parts[0], out uuid);
CreatorID = uuid;
}
if (parts.Length >= 2)
{ {
CreatorData = parts[1]; CreatorData = parts[1];
if (!CreatorData.EndsWith("/")) if (!CreatorData.EndsWith("/"))
CreatorData += "/"; CreatorData += "/";
if (parts.Length > 2)
CreatorData += ';' + parts[2];
else
CreatorData += ";Unknown User";
} }
if (parts.Length >= 3)
name = parts[2];
CreatorData += ';' + name;
} }
} }
} }
@ -4653,6 +4643,12 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status.
if(UsePhysics && !SetPhantom && m_localId == ParentGroup.RootPart.LocalId &&
m_vehicleParams != null && m_vehicleParams.CameraDecoupled)
AddFlag(PrimFlags.CameraDecoupled);
else
RemFlag(PrimFlags.CameraDecoupled);
if (pa.Building != building) if (pa.Building != building)
pa.Building = building; pa.Building = building;
} }

7
OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
View File

@ -278,10 +278,12 @@ namespace OpenSim.Services.Connectors
public GridRegion GetRegionByPosition(UUID scopeID, int x, int y) public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
{ {
GridRegion rinfo = null;
ulong regionHandle = Util.UIntsToLong((uint)x, (uint)y); ulong regionHandle = Util.UIntsToLong((uint)x, (uint)y);
if (m_regionCache.Contains(regionHandle)) // this cache includes NULL regions
return (GridRegion)m_regionCache[regionHandle]; if (m_regionCache.TryGetValue(regionHandle, out rinfo))
return rinfo;
Dictionary<string, object> sendData = new Dictionary<string, object>(); Dictionary<string, object> sendData = new Dictionary<string, object>();
@ -304,7 +306,6 @@ namespace OpenSim.Services.Connectors
return null; return null;
} }
GridRegion rinfo = null;
if (reply != string.Empty) if (reply != string.Empty)
{ {
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);