ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging slimupdates2

Browse Source
This commit is contained in:
unknown
2010-05-20 12:28:13 -07:00
parent 859beaf830 56f3cb6da0
commit beed74096c
32 changed files with 1101 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
View File

@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
{
m_log.DebugFormat("[ACTIVITY DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
}
public void OnNewClient(IClientAPI client)
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
{
// TODO: grab the parcel ID from ILandModule
// and send that along
m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
m_GridUserService.SetLastPosition(sp.UUID.ToString(), sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
}
}

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs
View File

@@ -162,9 +162,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
return m_GridUserService.SetHome(userID, homeID, homePosition, homeLookAt);
}
public bool SetLastPosition(string userID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
{
return m_GridUserService.SetLastPosition(userID, regionID, lastPosition, lastLookAt);
return m_GridUserService.SetLastPosition(userID, sessionID, regionID, lastPosition, lastLookAt);
}
public GridUserInfo GetGridUserInfo(string userID)

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs
View File

@@ -137,9 +137,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
return m_RemoteConnector.SetHome(userID, regionID, position, lookAt);
}
public bool SetLastPosition(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
{
return m_RemoteConnector.SetLastPosition(userID, regionID, position, lookAt);
return m_RemoteConnector.SetLastPosition(userID, sessionID, regionID, position, lookAt);
}
public GridUserInfo GetGridUserInfo(string userID)

16
OpenSim/Region/CoreModules/World/Land/LandChannel.cs
View File

@@ -154,6 +154,22 @@ namespace OpenSim.Region.CoreModules.World.Land
m_landManagementModule.UpdateLandObject(localID, data);
}
}
public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
{
if (m_landManagementModule != null)
{
m_landManagementModule.Join(start_x, start_y, end_x, end_y, attempting_user_id);
}
}
public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
{
if (m_landManagementModule != null)
{
m_landManagementModule.Subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
}
}
public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient)
{

10
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -948,6 +948,16 @@ namespace OpenSim.Region.CoreModules.World.Land
masterLandObject.SendLandUpdateToAvatarsOverMe();
}
public void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
{
join(start_x, start_y, end_x, end_y, attempting_user_id);
}
public void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id)
{
subdivide(start_x, start_y, end_x, end_y, attempting_user_id);
}
#endregion
#region Parcel Updating