aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
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/Framework
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/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs8
-rw-r--r--OpenSim/Framework/LandData.cs22
3 files changed, 27 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 6371105..d242cb3 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -715,7 +715,7 @@ namespace OpenSim.Framework.Communications.Cache
715 } 715 }
716 } 716 }
717 717
718 private InventoryFolderImpl FindFolderForType(int type) 718 public InventoryFolderImpl FindFolderForType(int type)
719 { 719 {
720 if (RootFolder == null) 720 if (RootFolder == null)
721 return null; 721 return null;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index db6025d..0bb790c 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -95,6 +95,7 @@ namespace OpenSim.Framework
95 95
96 // really don't want to be passing packets in these events, so this is very temporary. 96 // really don't want to be passing packets in these events, so this is very temporary.
97 public delegate void GenericCall4(Packet packet, IClientAPI remoteClient); 97 public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
98 public delegate void DeRezObject(IClientAPI remoteClient, uint localID, UUID groupID, byte destination, UUID destinationID);
98 99
99 public delegate void GenericCall5(IClientAPI remoteClient, bool status); 100 public delegate void GenericCall5(IClientAPI remoteClient, bool status);
100 101
@@ -319,6 +320,7 @@ namespace OpenSim.Framework
319 public delegate void DirPopularQuery(IClientAPI remoteClient, UUID queryID, uint queryFlags); 320 public delegate void DirPopularQuery(IClientAPI remoteClient, UUID queryID, uint queryFlags);
320 public delegate void DirClassifiedQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, uint category, int queryStart); 321 public delegate void DirClassifiedQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, uint category, int queryStart);
321 public delegate void EventInfoRequest(IClientAPI remoteClient, uint eventID); 322 public delegate void EventInfoRequest(IClientAPI remoteClient, uint eventID);
323 public delegate void ParcelSetOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime);
322 324
323 public delegate void MapItemRequest(IClientAPI remoteClient, uint flags, uint EstateID, bool godlike, uint itemtype, ulong regionhandle); 325 public delegate void MapItemRequest(IClientAPI remoteClient, uint flags, uint EstateID, bool godlike, uint itemtype, ulong regionhandle);
324 326
@@ -468,7 +470,7 @@ namespace OpenSim.Framework
468 event RequestAvatarProperties OnRequestAvatarProperties; 470 event RequestAvatarProperties OnRequestAvatarProperties;
469 event SetAlwaysRun OnSetAlwaysRun; 471 event SetAlwaysRun OnSetAlwaysRun;
470 event TeleportLandmarkRequest OnTeleportLandmarkRequest; 472 event TeleportLandmarkRequest OnTeleportLandmarkRequest;
471 event GenericCall4 OnDeRezObject; 473 event DeRezObject OnDeRezObject;
472 event Action<IClientAPI> OnRegionHandShakeReply; 474 event Action<IClientAPI> OnRegionHandShakeReply;
473 event GenericCall2 OnRequestWearables; 475 event GenericCall2 OnRequestWearables;
474 event GenericCall2 OnCompleteMovementToRegion; 476 event GenericCall2 OnCompleteMovementToRegion;
@@ -619,6 +621,7 @@ namespace OpenSim.Framework
619 event DirPopularQuery OnDirPopularQuery; 621 event DirPopularQuery OnDirPopularQuery;
620 event DirClassifiedQuery OnDirClassifiedQuery; 622 event DirClassifiedQuery OnDirClassifiedQuery;
621 event EventInfoRequest OnEventInfoRequest; 623 event EventInfoRequest OnEventInfoRequest;
624 event ParcelSetOtherCleanTime OnParcelSetOtherCleanTime;
622 625
623 event MapItemRequest OnMapItemRequest; 626 event MapItemRequest OnMapItemRequest;
624 627
@@ -700,9 +703,6 @@ namespace OpenSim.Framework
700 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, 703 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
701 Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId); 704 Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId);
702 705
703 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position,
704 Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity);
705
706 void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, 706 void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items,
707 List<InventoryFolderBase> folders, bool fetchFolders, 707 List<InventoryFolderBase> folders, bool fetchFolders,
708 bool fetchItems); 708 bool fetchItems);
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 4e66721..7d29d10 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -77,6 +77,8 @@ namespace OpenSim.Framework
77 private UUID _snapshotID = UUID.Zero; 77 private UUID _snapshotID = UUID.Zero;
78 private Vector3 _userLocation = new Vector3(); 78 private Vector3 _userLocation = new Vector3();
79 private Vector3 _userLookAt = new Vector3(); 79 private Vector3 _userLookAt = new Vector3();
80 private int _dwell = 0;
81 private int _otherCleanTime = 0;
80 82
81 public Vector3 AABBMax { 83 public Vector3 AABBMax {
82 get { 84 get {
@@ -402,6 +404,24 @@ namespace OpenSim.Framework
402 } 404 }
403 } 405 }
404 406
407 public int Dwell {
408 get {
409 return _dwell;
410 }
411 set {
412 _dwell = value;
413 }
414 }
415
416 public int OtherCleanTime {
417 get {
418 return _otherCleanTime;
419 }
420 set {
421 _otherCleanTime = value;
422 }
423 }
424
405 public LandData() 425 public LandData()
406 { 426 {
407 _globalID = UUID.Random(); 427 _globalID = UUID.Random();
@@ -444,6 +464,8 @@ namespace OpenSim.Framework
444 landData._snapshotID = _snapshotID; 464 landData._snapshotID = _snapshotID;
445 landData._userLocation = _userLocation; 465 landData._userLocation = _userLocation;
446 landData._userLookAt = _userLookAt; 466 landData._userLookAt = _userLookAt;
467 landData._otherCleanTime = _otherCleanTime;
468 landData._dwell = _dwell;
447 469
448 landData._parcelAccessList.Clear(); 470 landData._parcelAccessList.Clear();
449 foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList) 471 foreach (ParcelManager.ParcelAccessEntry entry in _parcelAccessList)