aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorMW2007-05-29 09:16:18 +0000
committerMW2007-05-29 09:16:18 +0000
commitb2eb26e4babbf87c8db84e67de116ef145feb2d6 (patch)
treeb5feafcaa4ee0dbe18c502203595d7e0d9014987 /Common
parentShould allow multiple worlds (and UDP servers) to be ran in one instance, jus... (diff)
downloadopensim-SC_OLD-b2eb26e4babbf87c8db84e67de116ef145feb2d6.zip
opensim-SC_OLD-b2eb26e4babbf87c8db84e67de116ef145feb2d6.tar.gz
opensim-SC_OLD-b2eb26e4babbf87c8db84e67de116ef145feb2d6.tar.bz2
opensim-SC_OLD-b2eb26e4babbf87c8db84e67de116ef145feb2d6.tar.xz
number of changes
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenSim.Framework/AgentInventory.cs11
-rw-r--r--Common/OpenSim.Framework/Interfaces/IClientAPI.cs7
-rw-r--r--Common/OpenSim.Framework/Interfaces/IWorld.cs4
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj1
-rw-r--r--Common/OpenSim.Framework/Types/AgentWearable.cs18
5 files changed, 27 insertions, 14 deletions
diff --git a/Common/OpenSim.Framework/AgentInventory.cs b/Common/OpenSim.Framework/AgentInventory.cs
index 6fdd6c5..f2ef729 100644
--- a/Common/OpenSim.Framework/AgentInventory.cs
+++ b/Common/OpenSim.Framework/AgentInventory.cs
@@ -237,15 +237,4 @@ namespace OpenSim.Framework.Inventory
237 return result; 237 return result;
238 } 238 }
239 } 239 }
240
241 public class AvatarWearable
242 {
243 public LLUUID AssetID = new LLUUID("00000000-0000-0000-0000-000000000000");
244 public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");
245
246 public AvatarWearable()
247 {
248
249 }
250 }
251} 240}
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index add6c00..8ba1571 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -18,6 +18,8 @@ namespace OpenSim.Framework.Interfaces
18 public delegate void GenericCall2(); 18 public delegate void GenericCall2();
19 public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary. 19 public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.
20 public delegate void GenericCall4(Packet packet, IClientAPI remoteClient); 20 public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
21 public delegate void GenericCall5(IClientAPI remoteClient, bool status);
22 public delegate void GenericCall6(LLUUID uid);
21 public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); 23 public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
22 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); 24 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
23 public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); 25 public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);
@@ -25,6 +27,7 @@ namespace OpenSim.Framework.Interfaces
25 public delegate void UpdatePrimVector(uint localID, LLVector3 pos, IClientAPI remoteClient); 27 public delegate void UpdatePrimVector(uint localID, LLVector3 pos, IClientAPI remoteClient);
26 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); 28 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);
27 public delegate void StatusChange(bool status); 29 public delegate void StatusChange(bool status);
30 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
28 31
29 public interface IClientAPI 32 public interface IClientAPI
30 { 33 {
@@ -50,6 +53,8 @@ namespace OpenSim.Framework.Interfaces
50 event UpdatePrimVector OnUpdatePrimScale; 53 event UpdatePrimVector OnUpdatePrimScale;
51 event StatusChange OnChildAgentStatus; 54 event StatusChange OnChildAgentStatus;
52 event GenericCall2 OnStopMovement; 55 event GenericCall2 OnStopMovement;
56 event NewAvatar OnNewAvatar;
57 event GenericCall6 OnRemoveAvatar;
53 58
54 LLVector3 StartPos 59 LLVector3 StartPos
55 { 60 {
@@ -63,7 +68,7 @@ namespace OpenSim.Framework.Interfaces
63 } 68 }
64 69
65 void OutPacket(Packet newPack); 70 void OutPacket(Packet newPack);
66 void SendAppearance(AvatarWearable[] wearables); 71 void SendWearables(AvatarWearable[] wearables);
67 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 72 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
68 } 73 }
69} 74}
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs
index 433e540..ab2d63d 100644
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs
@@ -8,8 +8,8 @@ namespace OpenSim.Framework.Interfaces
8{ 8{
9 public interface IWorld 9 public interface IWorld
10 { 10 {
11 bool AddNewAvatar(IClientAPI remoteClient, bool childAgent); 11 void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
12 bool RemoveAvatar(LLUUID agentID); 12 void RemoveAvatar(LLUUID agentID);
13 RegionInfo GetRegionInfo(); 13 RegionInfo GetRegionInfo();
14 } 14 }
15} 15}
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 519d5a8..6c2a8c6 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -110,6 +110,7 @@
110 </Compile> 110 </Compile>
111 <Compile Include="SimProfile.cs" /> 111 <Compile Include="SimProfile.cs" />
112 <Compile Include="SimProfileBase.cs" /> 112 <Compile Include="SimProfileBase.cs" />
113 <Compile Include="Types\AgentWearable.cs" />
113 <Compile Include="Types\NetworkServersInfo.cs" /> 114 <Compile Include="Types\NetworkServersInfo.cs" />
114 <Compile Include="UserProfile.cs"> 115 <Compile Include="UserProfile.cs">
115 <SubType>Code</SubType> 116 <SubType>Code</SubType>
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/Common/OpenSim.Framework/Types/AgentWearable.cs
new file mode 100644
index 0000000..b7fbe3c
--- /dev/null
+++ b/Common/OpenSim.Framework/Types/AgentWearable.cs
@@ -0,0 +1,18 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5
6namespace OpenSim.Framework.Types
7{
8 public class AvatarWearable
9 {
10 public LLUUID AssetID = new LLUUID("00000000-0000-0000-0000-000000000000");
11 public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");
12
13 public AvatarWearable()
14 {
15
16 }
17 }
18}