aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView/ClientView.Grid.cs59
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs29
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj3
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build1
4 files changed, 29 insertions, 63 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.Grid.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.Grid.cs
deleted file mode 100644
index ae4c066..0000000
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.Grid.cs
+++ /dev/null
@@ -1,59 +0,0 @@
1/*
2* Copyright (c) Contributors, http://www.openmetaverse.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using libsecondlife;
32using libsecondlife.Packets;
33using Nwc.XmlRpc;
34using System.Net;
35using System.Net.Sockets;
36using System.IO;
37using System.Threading;
38using System.Timers;
39using OpenSim.Framework.Interfaces;
40using OpenSim.Framework.Types;
41using OpenSim.Framework.Inventory;
42using OpenSim.Framework.Utilities;
43using OpenSim.Assets;
44
45namespace OpenSim
46{
47 public partial class ClientView
48 {
49
50 public void EnableNeighbours()
51 {
52
53 }
54
55 public void CrossSimBorder(LLVector3 avatarpos)
56 {
57 }
58 }
59}
diff --git a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
index d35868e..035eb4c 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView/ClientView.PacketHandlers.cs
@@ -189,5 +189,34 @@ namespace OpenSim
189 } 189 }
190 this.OutPacket(mbReply); 190 this.OutPacket(mbReply);
191 } 191 }
192
193 protected PrimData CreatePrimFromObjectAdd(ObjectAddPacket addPacket)
194 {
195 PrimData PData = new PrimData();
196 PData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
197 PData.PCode = addPacket.ObjectData.PCode;
198 PData.PathBegin = addPacket.ObjectData.PathBegin;
199 PData.PathEnd = addPacket.ObjectData.PathEnd;
200 PData.PathScaleX = addPacket.ObjectData.PathScaleX;
201 PData.PathScaleY = addPacket.ObjectData.PathScaleY;
202 PData.PathShearX = addPacket.ObjectData.PathShearX;
203 PData.PathShearY = addPacket.ObjectData.PathShearY;
204 PData.PathSkew = addPacket.ObjectData.PathSkew;
205 PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
206 PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
207 PData.Scale = addPacket.ObjectData.Scale;
208 PData.PathCurve = addPacket.ObjectData.PathCurve;
209 PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
210 PData.ParentID = 0;
211 PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
212 PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
213 PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
214 PData.PathTaperX = addPacket.ObjectData.PathTaperX;
215 PData.PathTaperY = addPacket.ObjectData.PathTaperY;
216 PData.PathTwist = addPacket.ObjectData.PathTwist;
217 PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
218
219 return PData;
220 }
192 } 221 }
193} 222}
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 9b8f367..3e6c1ea 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -170,9 +170,6 @@
170 <Compile Include="ClientView\ClientView.cs"> 170 <Compile Include="ClientView\ClientView.cs">
171 <SubType>Code</SubType> 171 <SubType>Code</SubType>
172 </Compile> 172 </Compile>
173 <Compile Include="ClientView\ClientView.Grid.cs">
174 <SubType>Code</SubType>
175 </Compile>
176 <Compile Include="ClientView\ClientView.PacketHandlers.cs"> 173 <Compile Include="ClientView\ClientView.PacketHandlers.cs">
177 <SubType>Code</SubType> 174 <SubType>Code</SubType>
178 </Compile> 175 </Compile>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index db4ef74..10e3422 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -22,7 +22,6 @@
22 <include name="ClientView/ClientView.AgentAssetUpload.cs" /> 22 <include name="ClientView/ClientView.AgentAssetUpload.cs" />
23 <include name="ClientView/ClientView.API.cs" /> 23 <include name="ClientView/ClientView.API.cs" />
24 <include name="ClientView/ClientView.cs" /> 24 <include name="ClientView/ClientView.cs" />
25 <include name="ClientView/ClientView.Grid.cs" />
26 <include name="ClientView/ClientView.PacketHandlers.cs" /> 25 <include name="ClientView/ClientView.PacketHandlers.cs" />
27 <include name="ClientView/ClientView.ProcessPackets.cs" /> 26 <include name="ClientView/ClientView.ProcessPackets.cs" />
28 <include name="ClientView/ClientViewBase.cs" /> 27 <include name="ClientView/ClientViewBase.cs" />