aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-18 05:51:36 +0000
committerMelanie Thielker2008-10-18 05:51:36 +0000
commitefe3f3eb2a0a31b1da474974c7d8193c2b28e13f (patch)
treedf1d30ad2f9230ea4e8fbfd1e6368d539600c785 /OpenSim/Region/Environment/Modules
parent* Fix an over compensation for bounciness on flat Primitive (diff)
downloadopensim-SC_OLD-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.zip
opensim-SC_OLD-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.tar.gz
opensim-SC_OLD-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.tar.bz2
opensim-SC_OLD-efe3f3eb2a0a31b1da474974c7d8193c2b28e13f.tar.xz
Megapatch. :) Fix skull attachment editing. Streamline Object terse updates.
Add rezzing time to objects. Add Object return and traffic fields to land database. Add plumbing for auto return. Implement auto return. Contains a migration. May contain nuts.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs9
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs15
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs9
3 files changed, 26 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
index 8747bd4..892d1ae 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs
@@ -175,6 +175,15 @@ namespace OpenSim.Region.Environment.Modules.World.Land
175 m_landManagementModule.setSimulatorObjectMaxOverride(overrideDel); 175 m_landManagementModule.setSimulatorObjectMaxOverride(overrideDel);
176 } 176 }
177 } 177 }
178
179 public void SetParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime)
180 {
181 if (m_landManagementModule != null)
182 {
183 m_landManagementModule.setParcelOtherCleanTime(remoteClient, localID, otherCleanTime);
184 }
185 }
186
178 #endregion 187 #endregion
179 188
180 } 189 }
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 0ecfdd3..d595185 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -1233,5 +1233,20 @@ namespace OpenSim.Region.Environment.Modules.World.Land
1233 else 1233 else
1234 m_log.Debug("[LAND] got no parcelinfo; not sending"); 1234 m_log.Debug("[LAND] got no parcelinfo; not sending");
1235 } 1235 }
1236
1237 public void setParcelOtherCleanTime(IClientAPI remoteClient, int localID,int otherCleanTime)
1238 {
1239 if (!landList.ContainsKey(localID))
1240 return;
1241
1242 ILandObject landObject = landList[localID];
1243
1244 if (!m_scene.ExternalChecks.ExternalChecksCanEditParcel(remoteClient.AgentId, landObject))
1245 return;
1246
1247 landObject.landData.OtherCleanTime = otherCleanTime;
1248
1249 UpdateLandObject(localID, landObject.landData);
1250 }
1236 } 1251 }
1237} 1252}
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index e5e6a79..52a2792 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
184 public event RequestAvatarProperties OnRequestAvatarProperties; 184 public event RequestAvatarProperties OnRequestAvatarProperties;
185 public event SetAlwaysRun OnSetAlwaysRun; 185 public event SetAlwaysRun OnSetAlwaysRun;
186 186
187 public event GenericCall4 OnDeRezObject; 187 public event DeRezObject OnDeRezObject;
188 public event Action<IClientAPI> OnRegionHandShakeReply; 188 public event Action<IClientAPI> OnRegionHandShakeReply;
189 public event GenericCall2 OnRequestWearables; 189 public event GenericCall2 OnRequestWearables;
190 public event GenericCall2 OnCompleteMovementToRegion; 190 public event GenericCall2 OnCompleteMovementToRegion;
@@ -330,6 +330,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
330 public event DirPopularQuery OnDirPopularQuery; 330 public event DirPopularQuery OnDirPopularQuery;
331 public event DirClassifiedQuery OnDirClassifiedQuery; 331 public event DirClassifiedQuery OnDirClassifiedQuery;
332 public event EventInfoRequest OnEventInfoRequest; 332 public event EventInfoRequest OnEventInfoRequest;
333 public event ParcelSetOtherCleanTime OnParcelSetOtherCleanTime;
333 334
334 public event MapItemRequest OnMapItemRequest; 335 public event MapItemRequest OnMapItemRequest;
335 336
@@ -587,12 +588,6 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
587 { 588 {
588 } 589 }
589 590
590 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
591 Vector3 position, Quaternion rotation, Vector3 velocity,
592 Vector3 rotationalvelocity)
593 {
594 }
595
596 public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID, 591 public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID,
597 List<InventoryItemBase> items, 592 List<InventoryItemBase> items,
598 List<InventoryFolderBase> folders, 593 List<InventoryFolderBase> folders,