aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
authorMW2007-07-22 11:44:36 +0000
committerMW2007-07-22 11:44:36 +0000
commit70fa30204272e874b8e3acccdc2e22cd4e42b2b2 (patch)
tree2f6c3c0f3b3bd60d5972f8dea6b3abeae4dc9065 /OpenSim/Framework/General
parent* Aerobic erosion now uses Navier Stokes algorithms for wind calculations. (diff)
downloadopensim-SC_OLD-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.zip
opensim-SC_OLD-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.tar.gz
opensim-SC_OLD-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.tar.bz2
opensim-SC_OLD-70fa30204272e874b8e3acccdc2e22cd4e42b2b2.tar.xz
* Some work in progress code: Inventory cache, start of inventory server/service, userprofile cache, inventory handling. (non of it is enabled yet (or at least it shouldn't be).
* Fixed some of the problems with crossing regions when flying: you should no longer sink to ground level when crossing (should keep roughly your right height). Should no longer sometimes get sent back to the centre of the current region when attempting to border cross. But instead sometimes you will find you avatar stop at the edge of region and you will need to start moving again to retry the crossing (which should then work). This code is partly based on Babblefrog's issue #212 patch. [I think I have some ideas of how to solve the stopping at edges problem, just want to get the inventory code done first] * Capabilities code has now been moved to the OpenSim.Framework.Communications project as some of the caps code will be tightly tied to inventory/asset handling and it was causing a two way reference problem when it was in its own project/dll. This is a Big commit as I was going to keep my inventory work local until I had it in a working state, in case it brakes anything, but its getting harder to keep in sync with svn.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/IRegionCommsListener.cs4
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs7
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs4
-rw-r--r--OpenSim/Framework/General/RegionCommsListener.cs15
4 files changed, 24 insertions, 6 deletions
diff --git a/OpenSim/Framework/General/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
index 81da5d4..b746671 100644
--- a/OpenSim/Framework/General/IRegionCommsListener.cs
+++ b/OpenSim/Framework/General/IRegionCommsListener.cs
@@ -34,13 +34,15 @@ namespace OpenSim.Framework
34{ 34{
35 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent); 35 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
36 public delegate void UpdateNeighbours(List<RegionInfo> neighbours); 36 public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
37 public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position); 37 public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying);
38 public delegate void AcknowledgeAgentCross(ulong regionHandle, LLUUID agentID);
38 39
39 public interface IRegionCommsListener 40 public interface IRegionCommsListener
40 { 41 {
41 event ExpectUserDelegate OnExpectUser; 42 event ExpectUserDelegate OnExpectUser;
42 event GenericCall2 OnExpectChildAgent; 43 event GenericCall2 OnExpectChildAgent;
43 event AgentCrossing OnAvatarCrossingIntoRegion; 44 event AgentCrossing OnAvatarCrossingIntoRegion;
45 event AcknowledgeAgentCross OnAcknowledgeAgentCrossed;
44 event UpdateNeighbours OnNeighboursUpdate; 46 event UpdateNeighbours OnNeighboursUpdate;
45 } 47 }
46} 48}
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index df65027..c2af2f4 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -81,8 +81,9 @@ namespace OpenSim.Framework.Interfaces
81 public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape); 81 public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape);
82 82
83 public delegate void CreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID); 83 public delegate void CreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID);
84 public delegate void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask);
84 public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder); 85 public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
85 86 public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID);
86 public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID); 87 public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID);
87 88
88 public interface IClientAPI 89 public interface IClientAPI
@@ -128,8 +129,10 @@ namespace OpenSim.Framework.Interfaces
128 event NewAvatar OnNewAvatar; 129 event NewAvatar OnNewAvatar;
129 event GenericCall6 OnRemoveAvatar; 130 event GenericCall6 OnRemoveAvatar;
130 131
132 event CreateNewInventoryItem OnCreateNewInventoryItem;
131 event CreateInventoryFolder OnCreateNewInventoryFolder; 133 event CreateInventoryFolder OnCreateNewInventoryFolder;
132 event FetchInventoryDescendents OnFetchInventoryDescendents; 134 event FetchInventoryDescendents OnFetchInventoryDescendents;
135 event FetchInventory OnFetchInventory;
133 event RequestTaskInventory OnRequestTaskInventory; 136 event RequestTaskInventory OnRequestTaskInventory;
134 137
135 event UUIDNameRequest OnNameFromUUIDRequest; 138 event UUIDNameRequest OnNameFromUUIDRequest;
@@ -194,7 +197,7 @@ namespace OpenSim.Framework.Interfaces
194 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation); 197 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation);
195 198
196 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items); 199 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items);
197 void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item); 200 void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item);
198 void SendInventoryItemUpdate(InventoryItemBase Item); 201 void SendInventoryItemUpdate(InventoryItemBase Item);
199 void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName); 202 void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName);
200 203
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 18ac527..1b42064 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -52,8 +52,10 @@ namespace OpenSim.Framework
52 public event NewAvatar OnNewAvatar; 52 public event NewAvatar OnNewAvatar;
53 public event GenericCall6 OnRemoveAvatar; 53 public event GenericCall6 OnRemoveAvatar;
54 54
55 public event CreateNewInventoryItem OnCreateNewInventoryItem;
55 public event CreateInventoryFolder OnCreateNewInventoryFolder; 56 public event CreateInventoryFolder OnCreateNewInventoryFolder;
56 public event FetchInventoryDescendents OnFetchInventoryDescendents; 57 public event FetchInventoryDescendents OnFetchInventoryDescendents;
58 public event FetchInventory OnFetchInventory;
57 public event RequestTaskInventory OnRequestTaskInventory; 59 public event RequestTaskInventory OnRequestTaskInventory;
58 60
59 public event UUIDNameRequest OnNameFromUUIDRequest; 61 public event UUIDNameRequest OnNameFromUUIDRequest;
@@ -127,7 +129,7 @@ namespace OpenSim.Framework
127 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation){} 129 public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation){}
128 130
129 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){} 131 public virtual void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items){}
130 public virtual void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item){} 132 public virtual void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item){}
131 public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { } 133 public virtual void SendInventoryItemUpdate(InventoryItemBase Item) { }
132 public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { } 134 public virtual void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName) { }
133 135
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index f5b8272..f7edb7e 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -39,6 +39,7 @@ namespace OpenSim.Framework
39 public event GenericCall2 OnExpectChildAgent; 39 public event GenericCall2 OnExpectChildAgent;
40 public event AgentCrossing OnAvatarCrossingIntoRegion; 40 public event AgentCrossing OnAvatarCrossingIntoRegion;
41 public event UpdateNeighbours OnNeighboursUpdate; 41 public event UpdateNeighbours OnNeighboursUpdate;
42 public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed;
42 43
43 /// <summary> 44 /// <summary>
44 /// 45 ///
@@ -57,11 +58,21 @@ namespace OpenSim.Framework
57 return false; 58 return false;
58 } 59 }
59 60
60 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position) 61 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
61 { 62 {
62 if (OnAvatarCrossingIntoRegion != null) 63 if (OnAvatarCrossingIntoRegion != null)
63 { 64 {
64 OnAvatarCrossingIntoRegion(regionHandle, agentID, position); 65 OnAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying);
66 return true;
67 }
68 return false;
69 }
70
71 public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID)
72 {
73 if (OnAcknowledgeAgentCrossed != null)
74 {
75 OnAcknowledgeAgentCrossed(regionHandle, agentID);
65 return true; 76 return true;
66 } 77 }
67 return false; 78 return false;