aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common/OpenSim.Framework
diff options
context:
space:
mode:
Diffstat (limited to 'Common/OpenSim.Framework')
-rw-r--r--Common/OpenSim.Framework/Interfaces/IClientAPI.cs1
-rw-r--r--Common/OpenSim.Framework/Interfaces/IWorld.cs5
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj84
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj.user12
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build60
-rw-r--r--Common/OpenSim.Framework/Types/AgentWearable.cs15
6 files changed, 92 insertions, 85 deletions
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index d5b2ae4..9d28dab 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Framework.Interfaces
94 void OutPacket(Packet newPack); 94 void OutPacket(Packet newPack);
95 void SendWearables(AvatarWearable[] wearables); 95 void SendWearables(AvatarWearable[] wearables);
96 void SendRegionHandshake(RegionInfo regionInfo); 96 void SendRegionHandshake(RegionInfo regionInfo);
97 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
97 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 98 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
98 void SendLayerData(float[] map); 99 void SendLayerData(float[] map);
99 void MoveAgentIntoRegion(RegionInfo regInfo); 100 void MoveAgentIntoRegion(RegionInfo regInfo);
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs
index ab2d63d..eee30b7 100644
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs
@@ -10,6 +10,9 @@ namespace OpenSim.Framework.Interfaces
10 { 10 {
11 void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child); 11 void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
12 void RemoveAvatar(LLUUID agentID); 12 void RemoveAvatar(LLUUID agentID);
13 RegionInfo GetRegionInfo(); 13
14 RegionInfo RegionInfo { get; }
15 object SyncRoot { get; }
16 uint NextLocalId { get; }
14 } 17 }
15} 18}
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 7e14e6a..f72c5f5 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -90,58 +90,49 @@
90 </ProjectReference> 90 </ProjectReference>
91 </ItemGroup> 91 </ItemGroup>
92 <ItemGroup> 92 <ItemGroup>
93 <Compile Include="RegionCommsHostBase.cs">
94 <SubType>Code</SubType>
95 </Compile>
96 <Compile Include="AgentInventory.cs"> 93 <Compile Include="AgentInventory.cs">
97 <SubType>Code</SubType> 94 <SubType>Code</SubType>
98 </Compile> 95 </Compile>
99 <Compile Include="AuthenticateSessionBase.cs"> 96 <Compile Include="AuthenticateSessionBase.cs">
100 <SubType>Code</SubType> 97 <SubType>Code</SubType>
101 </Compile> 98 </Compile>
102 <Compile Include="Util.cs"> 99 <Compile Include="BlockingQueue.cs">
103 <SubType>Code</SubType>
104 </Compile>
105 <Compile Include="Remoting.cs">
106 <SubType>Code</SubType> 100 <SubType>Code</SubType>
107 </Compile> 101 </Compile>
108 <Compile Include="UserProfileManagerBase.cs"> 102 <Compile Include="IRegionCommsHost.cs">
109 <SubType>Code</SubType> 103 <SubType>Code</SubType>
110 </Compile> 104 </Compile>
111 <Compile Include="LoginService.cs"> 105 <Compile Include="LoginService.cs">
112 <SubType>Code</SubType> 106 <SubType>Code</SubType>
113 </Compile> 107 </Compile>
114 <Compile Include="IRegionCommsHost.cs"> 108 <Compile Include="RegionCommsHostBase.cs">
115 <SubType>Code</SubType>
116 </Compile>
117 <Compile Include="UserProfileManager.cs">
118 <SubType>Code</SubType> 109 <SubType>Code</SubType>
119 </Compile> 110 </Compile>
120 <Compile Include="BlockingQueue.cs"> 111 <Compile Include="Remoting.cs">
121 <SubType>Code</SubType> 112 <SubType>Code</SubType>
122 </Compile> 113 </Compile>
123 <Compile Include="UserProfile.cs"> 114 <Compile Include="SimProfile.cs">
124 <SubType>Code</SubType> 115 <SubType>Code</SubType>
125 </Compile> 116 </Compile>
126 <Compile Include="SimProfileBase.cs"> 117 <Compile Include="SimProfileBase.cs">
127 <SubType>Code</SubType> 118 <SubType>Code</SubType>
128 </Compile> 119 </Compile>
129 <Compile Include="SimProfile.cs"> 120 <Compile Include="UserProfile.cs">
130 <SubType>Code</SubType> 121 <SubType>Code</SubType>
131 </Compile> 122 </Compile>
132 <Compile Include="Interfaces\LocalGridBase.cs"> 123 <Compile Include="UserProfileManager.cs">
133 <SubType>Code</SubType> 124 <SubType>Code</SubType>
134 </Compile> 125 </Compile>
135 <Compile Include="Interfaces\RemoteGridBase.cs"> 126 <Compile Include="UserProfileManagerBase.cs">
136 <SubType>Code</SubType> 127 <SubType>Code</SubType>
137 </Compile> 128 </Compile>
138 <Compile Include="Interfaces\IUserServer.cs"> 129 <Compile Include="Util.cs">
139 <SubType>Code</SubType> 130 <SubType>Code</SubType>
140 </Compile> 131 </Compile>
141 <Compile Include="Interfaces\IAssetServer.cs"> 132 <Compile Include="Interfaces\IAssetServer.cs">
142 <SubType>Code</SubType> 133 <SubType>Code</SubType>
143 </Compile> 134 </Compile>
144 <Compile Include="Interfaces\IWorld.cs"> 135 <Compile Include="Interfaces\IClientAPI.cs">
145 <SubType>Code</SubType> 136 <SubType>Code</SubType>
146 </Compile> 137 </Compile>
147 <Compile Include="Interfaces\IGridServer.cs"> 138 <Compile Include="Interfaces\IGridServer.cs">
@@ -150,61 +141,64 @@
150 <Compile Include="Interfaces\ILocalStorage.cs"> 141 <Compile Include="Interfaces\ILocalStorage.cs">
151 <SubType>Code</SubType> 142 <SubType>Code</SubType>
152 </Compile> 143 </Compile>
153 <Compile Include="Interfaces\IClientAPI.cs"> 144 <Compile Include="Interfaces\IUserServer.cs">
154 <SubType>Code</SubType> 145 <SubType>Code</SubType>
155 </Compile> 146 </Compile>
156 <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> 147 <Compile Include="Interfaces\IWorld.cs">
157 <SubType>Code</SubType> 148 <SubType>Code</SubType>
158 </Compile> 149 </Compile>
159 <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> 150 <Compile Include="Interfaces\LocalGridBase.cs">
160 <SubType>Code</SubType> 151 <SubType>Code</SubType>
161 </Compile> 152 </Compile>
162 <Compile Include="Interfaces\Remoting\IProxyServerHost.cs"> 153 <Compile Include="Interfaces\RemoteGridBase.cs">
163 <SubType>Code</SubType> 154 <SubType>Code</SubType>
164 </Compile> 155 </Compile>
165 <Compile Include="Interfaces\Remoting\IProxyServerClient.cs"> 156 <Compile Include="Interfaces\Config\IGenericConfig.cs">
166 <SubType>Code</SubType> 157 <SubType>Code</SubType>
167 </Compile> 158 </Compile>
168 <Compile Include="Interfaces\Remoting\IRegionGridClient.cs"> 159 <Compile Include="Interfaces\Config\IGridConfig.cs">
169 <SubType>Code</SubType> 160 <SubType>Code</SubType>
170 </Compile> 161 </Compile>
171 <Compile Include="Interfaces\Remoting\IGridServerHost.cs"> 162 <Compile Include="Interfaces\Config\IUserConfig.cs">
172 <SubType>Code</SubType> 163 <SubType>Code</SubType>
173 </Compile> 164 </Compile>
174 <Compile Include="Interfaces\Remoting\IRegionSimHost.cs"> 165 <Compile Include="Interfaces\Remoting\IGridServerHost.cs">
175 <SubType>Code</SubType> 166 <SubType>Code</SubType>
176 </Compile> 167 </Compile>
177 <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs"> 168 <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">
178 <SubType>Code</SubType> 169 <SubType>Code</SubType>
179 </Compile> 170 </Compile>
180 <Compile Include="Interfaces\Config\IGenericConfig.cs"> 171 <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">
181 <SubType>Code</SubType> 172 <SubType>Code</SubType>
182 </Compile> 173 </Compile>
183 <Compile Include="Interfaces\Config\IUserConfig.cs"> 174 <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">
184 <SubType>Code</SubType> 175 <SubType>Code</SubType>
185 </Compile> 176 </Compile>
186 <Compile Include="Interfaces\Config\IGridConfig.cs"> 177 <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">
187 <SubType>Code</SubType> 178 <SubType>Code</SubType>
188 </Compile> 179 </Compile>
189 <Compile Include="Properties\AssemblyInfo.cs"> 180 <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">
190 <SubType>Code</SubType> 181 <SubType>Code</SubType>
191 </Compile> 182 </Compile>
192 <Compile Include="Types\NeighbourInfo.cs"> 183 <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
193 <SubType>Code</SubType> 184 <SubType>Code</SubType>
194 </Compile> 185 </Compile>
195 <Compile Include="Types\NetworkServersInfo.cs"> 186 <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
196 <SubType>Code</SubType> 187 <SubType>Code</SubType>
197 </Compile> 188 </Compile>
198 <Compile Include="Types\RegionInfo.cs"> 189 <Compile Include="Properties\AssemblyInfo.cs">
199 <SubType>Code</SubType> 190 <SubType>Code</SubType>
200 </Compile> 191 </Compile>
201 <Compile Include="Types\ParcelData.cs"> 192 <Compile Include="Types\AgentCiruitData.cs">
202 <SubType>Code</SubType> 193 <SubType>Code</SubType>
203 </Compile> 194 </Compile>
204 <Compile Include="Types\AgentWearable.cs"> 195 <Compile Include="Types\AgentWearable.cs">
205 <SubType>Code</SubType> 196 <SubType>Code</SubType>
206 </Compile> 197 </Compile>
207 <Compile Include="Types\PrimData.cs"> 198 <Compile Include="Types\AssetBase.cs">
199 <SubType>Code</SubType>
200 </Compile>
201 <Compile Include="Types\AssetLandmark.cs">
208 <SubType>Code</SubType> 202 <SubType>Code</SubType>
209 </Compile> 203 </Compile>
210 <Compile Include="Types\AssetStorage.cs"> 204 <Compile Include="Types\AssetStorage.cs">
@@ -213,19 +207,25 @@
213 <Compile Include="Types\EstateSettings.cs"> 207 <Compile Include="Types\EstateSettings.cs">
214 <SubType>Code</SubType> 208 <SubType>Code</SubType>
215 </Compile> 209 </Compile>
216 <Compile Include="Types\OSVector3.cs"> 210 <Compile Include="Types\Login.cs">
217 <SubType>Code</SubType> 211 <SubType>Code</SubType>
218 </Compile> 212 </Compile>
219 <Compile Include="Types\AgentCiruitData.cs"> 213 <Compile Include="Types\NeighbourInfo.cs">
220 <SubType>Code</SubType> 214 <SubType>Code</SubType>
221 </Compile> 215 </Compile>
222 <Compile Include="Types\Login.cs"> 216 <Compile Include="Types\NetworkServersInfo.cs">
223 <SubType>Code</SubType> 217 <SubType>Code</SubType>
224 </Compile> 218 </Compile>
225 <Compile Include="Types\AssetLandmark.cs"> 219 <Compile Include="Types\OSVector3.cs">
226 <SubType>Code</SubType> 220 <SubType>Code</SubType>
227 </Compile> 221 </Compile>
228 <Compile Include="Types\AssetBase.cs"> 222 <Compile Include="Types\ParcelData.cs">
223 <SubType>Code</SubType>
224 </Compile>
225 <Compile Include="Types\PrimData.cs">
226 <SubType>Code</SubType>
227 </Compile>
228 <Compile Include="Types\RegionInfo.cs">
229 <SubType>Code</SubType> 229 <SubType>Code</SubType>
230 </Compile> 230 </Compile>
231 </ItemGroup> 231 </ItemGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 2678e54..7ead9a8 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,52 +11,52 @@
11 <resources prefix="OpenSim.Framework" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="RegionCommsHostBase.cs" />
15 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
16 <include name="AuthenticateSessionBase.cs" /> 15 <include name="AuthenticateSessionBase.cs" />
17 <include name="Util.cs" />
18 <include name="Remoting.cs" />
19 <include name="UserProfileManagerBase.cs" />
20 <include name="LoginService.cs" />
21 <include name="IRegionCommsHost.cs" />
22 <include name="UserProfileManager.cs" />
23 <include name="BlockingQueue.cs" /> 16 <include name="BlockingQueue.cs" />
24 <include name="UserProfile.cs" /> 17 <include name="IRegionCommsHost.cs" />
25 <include name="SimProfileBase.cs" /> 18 <include name="LoginService.cs" />
19 <include name="RegionCommsHostBase.cs" />
20 <include name="Remoting.cs" />
26 <include name="SimProfile.cs" /> 21 <include name="SimProfile.cs" />
27 <include name="Interfaces/LocalGridBase.cs" /> 22 <include name="SimProfileBase.cs" />
28 <include name="Interfaces/RemoteGridBase.cs" /> 23 <include name="UserProfile.cs" />
29 <include name="Interfaces/IUserServer.cs" /> 24 <include name="UserProfileManager.cs" />
25 <include name="UserProfileManagerBase.cs" />
26 <include name="Util.cs" />
30 <include name="Interfaces/IAssetServer.cs" /> 27 <include name="Interfaces/IAssetServer.cs" />
31 <include name="Interfaces/IWorld.cs" /> 28 <include name="Interfaces/IClientAPI.cs" />
32 <include name="Interfaces/IGridServer.cs" /> 29 <include name="Interfaces/IGridServer.cs" />
33 <include name="Interfaces/ILocalStorage.cs" /> 30 <include name="Interfaces/ILocalStorage.cs" />
34 <include name="Interfaces/IClientAPI.cs" /> 31 <include name="Interfaces/IUserServer.cs" />
35 <include name="Interfaces/Scripting/IScriptEngine.cs" /> 32 <include name="Interfaces/IWorld.cs" />
36 <include name="Interfaces/Scripting/IScriptAPI.cs" /> 33 <include name="Interfaces/LocalGridBase.cs" />
37 <include name="Interfaces/Remoting/IProxyServerHost.cs" /> 34 <include name="Interfaces/RemoteGridBase.cs" />
35 <include name="Interfaces/Config/IGenericConfig.cs" />
36 <include name="Interfaces/Config/IGridConfig.cs" />
37 <include name="Interfaces/Config/IUserConfig.cs" />
38 <include name="Interfaces/Remoting/IGridServerHost.cs" />
38 <include name="Interfaces/Remoting/IProxyServerClient.cs" /> 39 <include name="Interfaces/Remoting/IProxyServerClient.cs" />
40 <include name="Interfaces/Remoting/IProxyServerHost.cs" />
39 <include name="Interfaces/Remoting/IRegionGridClient.cs" /> 41 <include name="Interfaces/Remoting/IRegionGridClient.cs" />
40 <include name="Interfaces/Remoting/IGridServerHost.cs" />
41 <include name="Interfaces/Remoting/IRegionSimHost.cs" /> 42 <include name="Interfaces/Remoting/IRegionSimHost.cs" />
42 <include name="Interfaces/Remoting/RegionGridClientBase.cs" /> 43 <include name="Interfaces/Remoting/RegionGridClientBase.cs" />
43 <include name="Interfaces/Config/IGenericConfig.cs" /> 44 <include name="Interfaces/Scripting/IScriptAPI.cs" />
44 <include name="Interfaces/Config/IUserConfig.cs" /> 45 <include name="Interfaces/Scripting/IScriptEngine.cs" />
45 <include name="Interfaces/Config/IGridConfig.cs" />
46 <include name="Properties/AssemblyInfo.cs" /> 46 <include name="Properties/AssemblyInfo.cs" />
47 <include name="Types/NeighbourInfo.cs" /> 47 <include name="Types/AgentCiruitData.cs" />
48 <include name="Types/NetworkServersInfo.cs" />
49 <include name="Types/RegionInfo.cs" />
50 <include name="Types/ParcelData.cs" />
51 <include name="Types/AgentWearable.cs" /> 48 <include name="Types/AgentWearable.cs" />
52 <include name="Types/PrimData.cs" /> 49 <include name="Types/AssetBase.cs" />
50 <include name="Types/AssetLandmark.cs" />
53 <include name="Types/AssetStorage.cs" /> 51 <include name="Types/AssetStorage.cs" />
54 <include name="Types/EstateSettings.cs" /> 52 <include name="Types/EstateSettings.cs" />
55 <include name="Types/OSVector3.cs" />
56 <include name="Types/AgentCiruitData.cs" />
57 <include name="Types/Login.cs" /> 53 <include name="Types/Login.cs" />
58 <include name="Types/AssetLandmark.cs" /> 54 <include name="Types/NeighbourInfo.cs" />
59 <include name="Types/AssetBase.cs" /> 55 <include name="Types/NetworkServersInfo.cs" />
56 <include name="Types/OSVector3.cs" />
57 <include name="Types/ParcelData.cs" />
58 <include name="Types/PrimData.cs" />
59 <include name="Types/RegionInfo.cs" />
60 </sources> 60 </sources>
61 <references basedir="${project::get-base-directory()}"> 61 <references basedir="${project::get-base-directory()}">
62 <lib> 62 <lib>
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/Common/OpenSim.Framework/Types/AgentWearable.cs
index b7fbe3c..49c1292 100644
--- a/Common/OpenSim.Framework/Types/AgentWearable.cs
+++ b/Common/OpenSim.Framework/Types/AgentWearable.cs
@@ -14,5 +14,20 @@ namespace OpenSim.Framework.Types
14 { 14 {
15 15
16 } 16 }
17
18 public static AvatarWearable[] DefaultWearables
19 {
20 get
21 {
22 AvatarWearable[] defaultWearables = new AvatarWearable[13]; //should be 13 of these
23 for (int i = 0; i < 13; i++)
24 {
25 defaultWearables[i] = new AvatarWearable();
26 }
27 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
28 defaultWearables[0].ItemID = LLUUID.Random();
29 return defaultWearables;
30 }
31 }
17 } 32 }
18} 33}
generated by cgit v1.1 at 2024-11-06 05:17:36 +0000