aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorMW2007-05-15 14:54:53 +0000
committerMW2007-05-15 14:54:53 +0000
commitf41e5343c5568ba27893551716af9e578a81dfbe (patch)
treef25017fd937029c18099e01bff09aa57279ed4c7 /OpenSim.RegionServer
parentprovide ready-to-eat attributes parsed from byte array (diff)
downloadopensim-SC-f41e5343c5568ba27893551716af9e578a81dfbe.zip
opensim-SC-f41e5343c5568ba27893551716af9e578a81dfbe.tar.gz
opensim-SC-f41e5343c5568ba27893551716af9e578a81dfbe.tar.bz2
opensim-SC-f41e5343c5568ba27893551716af9e578a81dfbe.tar.xz
updated Build/project files to include the new projects and new files.
Improved the enable neighbours code (Simclient thread should no longer sleep for 3 seconds for each neighbour).
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj3
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build159
-rw-r--r--OpenSim.RegionServer/SimClient.cs10
-rw-r--r--OpenSim.RegionServer/world/SceneObject.cs17
4 files changed, 108 insertions, 81 deletions
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index a473a3c..9901fa5 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -187,6 +187,9 @@
187 <Compile Include="world\Primitive2.cs"> 187 <Compile Include="world\Primitive2.cs">
188 <SubType>Code</SubType> 188 <SubType>Code</SubType>
189 </Compile> 189 </Compile>
190 <Compile Include="world\SceneObject.cs">
191 <SubType>Code</SubType>
192 </Compile>
190 <Compile Include="world\World.cs"> 193 <Compile Include="world\World.cs">
191 <SubType>Code</SubType> 194 <SubType>Code</SubType>
192 </Compile> 195 </Compile>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 871d639..ca1fa8c 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -1,79 +1,80 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.RegionServer" default="build"> 2<project name="OpenSim.RegionServer" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentAssetUpload.cs" /> 14 <include name="AgentAssetUpload.cs" />
15 <include name="Grid.cs" /> 15 <include name="Grid.cs" />
16 <include name="OpenSimMain.cs" /> 16 <include name="OpenSimMain.cs" />
17 <include name="OpenSimNetworkHandler.cs" /> 17 <include name="OpenSimNetworkHandler.cs" />
18 <include name="PacketServer.cs" /> 18 <include name="PacketServer.cs" />
19 <include name="QueItem.cs" /> 19 <include name="QueItem.cs" />
20 <include name="RegionInfo.cs" /> 20 <include name="RegionInfo.cs" />
21 <include name="SimClient.cs" /> 21 <include name="SimClient.cs" />
22 <include name="VersionInfo.cs" /> 22 <include name="VersionInfo.cs" />
23 <include name="Assets/AssetCache.cs" /> 23 <include name="Assets/AssetCache.cs" />
24 <include name="Assets/InventoryCache.cs" /> 24 <include name="Assets/InventoryCache.cs" />
25 <include name="CAPS/AdminWebFront.cs" /> 25 <include name="CAPS/AdminWebFront.cs" />
26 <include name="types/Mesh.cs" /> 26 <include name="types/Mesh.cs" />
27 <include name="types/Triangle.cs" /> 27 <include name="types/Triangle.cs" />
28 <include name="world/Avatar.cs" /> 28 <include name="world/Avatar.cs" />
29 <include name="world/AvatarAnimations.cs" /> 29 <include name="world/AvatarAnimations.cs" />
30 <include name="world/AvatarClient.cs" /> 30 <include name="world/AvatarClient.cs" />
31 <include name="world/AvatarUpdate.cs" /> 31 <include name="world/AvatarUpdate.cs" />
32 <include name="world/Entity.cs" /> 32 <include name="world/Entity.cs" />
33 <include name="world/Primitive.cs" /> 33 <include name="world/Primitive.cs" />
34 <include name="world/Primitive2.cs" /> 34 <include name="world/Primitive2.cs" />
35 <include name="world/World.cs" /> 35 <include name="world/SceneObject.cs" />
36 <include name="world/WorldPacketHandlers.cs" /> 36 <include name="world/World.cs" />
37 <include name="world/WorldScripting.cs" /> 37 <include name="world/WorldPacketHandlers.cs" />
38 <include name="world/scripting/IScriptContext.cs" /> 38 <include name="world/WorldScripting.cs" />
39 <include name="world/scripting/IScriptEntity.cs" /> 39 <include name="world/scripting/IScriptContext.cs" />
40 <include name="world/scripting/IScriptHandler.cs" /> 40 <include name="world/scripting/IScriptEntity.cs" />
41 <include name="world/scripting/Script.cs" /> 41 <include name="world/scripting/IScriptHandler.cs" />
42 <include name="world/scripting/ScriptFactory.cs" /> 42 <include name="world/scripting/Script.cs" />
43 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> 43 <include name="world/scripting/ScriptFactory.cs" />
44 </sources> 44 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
45 <references basedir="${project::get-base-directory()}"> 45 </sources>
46 <lib> 46 <references basedir="${project::get-base-directory()}">
47 <include name="${project::get-base-directory()}" /> 47 <lib>
48 <include name="${project::get-base-directory()}/${build.dir}" /> 48 <include name="${project::get-base-directory()}" />
49 </lib> 49 <include name="${project::get-base-directory()}/${build.dir}" />
50 <include name="System.dll" /> 50 </lib>
51 <include name="System.Xml.dll" /> 51 <include name="System.dll" />
52 <include name="../bin/libsecondlife.dll" /> 52 <include name="System.Xml.dll" />
53 <include name="../bin/Axiom.MathLib.dll" /> 53 <include name="../bin/libsecondlife.dll" />
54 <include name="../bin/Db4objects.Db4o.dll" /> 54 <include name="../bin/Axiom.MathLib.dll" />
55 <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" /> 55 <include name="../bin/Db4objects.Db4o.dll" />
56 <include name="../bin/OpenSim.Framework.dll" /> 56 <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" />
57 <include name="../bin/OpenSim.Framework.Console.dll" /> 57 <include name="../bin/OpenSim.Framework.dll" />
58 <include name="../bin/OpenSim.GenericConfig.Xml.dll" /> 58 <include name="../bin/OpenSim.Framework.Console.dll" />
59 <include name="../bin/OpenSim.Physics.Manager.dll" /> 59 <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
60 <include name="../bin/OpenSim.Servers.dll" /> 60 <include name="../bin/OpenSim.Physics.Manager.dll" />
61 <include name="../bin/XMLRPC.dll" /> 61 <include name="../bin/OpenSim.Servers.dll" />
62 </references> 62 <include name="../bin/XMLRPC.dll" />
63 </csc> 63 </references>
64 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 64 </csc>
65 <mkdir dir="${project::get-base-directory()}/../bin/"/> 65 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
66 <copy todir="${project::get-base-directory()}/../bin/"> 66 <mkdir dir="${project::get-base-directory()}/../bin/"/>
67 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 67 <copy todir="${project::get-base-directory()}/../bin/">
68 <include name="*.dll"/> 68 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
69 <include name="*.exe"/> 69 <include name="*.dll"/>
70 </fileset> 70 <include name="*.exe"/>
71 </copy> 71 </fileset>
72 </target> 72 </copy>
73 <target name="clean"> 73 </target>
74 <delete dir="${bin.dir}" failonerror="false" /> 74 <target name="clean">
75 <delete dir="${obj.dir}" failonerror="false" /> 75 <delete dir="${bin.dir}" failonerror="false" />
76 </target> 76 <delete dir="${obj.dir}" failonerror="false" />
77 <target name="doc" description="Creates documentation."> 77 </target>
78 </target> 78 <target name="doc" description="Creates documentation.">
79</project> 79 </target>
80</project>
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 1f92a93..49221f8 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -1236,6 +1236,7 @@ namespace OpenSim
1236 ArrayList SendParams; 1236 ArrayList SendParams;
1237 XmlRpcRequest GridReq; 1237 XmlRpcRequest GridReq;
1238 XmlRpcResponse GridResp; 1238 XmlRpcResponse GridResp;
1239 List<Packet> enablePackets = new List<Packet>();
1239 foreach (Hashtable neighbour in ((RemoteGridBase)this.m_gridServer).neighbours) 1240 foreach (Hashtable neighbour in ((RemoteGridBase)this.m_gridServer).neighbours)
1240 { 1241 {
1241 Console.WriteLine( "http://" + neighbour["sim_ip"] + ":" + neighbour["sim_port"]); 1242 Console.WriteLine( "http://" + neighbour["sim_ip"] + ":" + neighbour["sim_port"]);
@@ -1262,9 +1263,14 @@ namespace OpenSim
1262 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8; 1263 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
1263 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0]; 1264 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
1264 enablesimpacket.SimulatorInfo.Port = (ushort)Convert.ToInt32(neighbour["sim_port"]); 1265 enablesimpacket.SimulatorInfo.Port = (ushort)Convert.ToInt32(neighbour["sim_port"]);
1265 Thread.Sleep(3000); 1266 enablePackets.Add(enablesimpacket);
1266 this.OutPacket(enablesimpacket);
1267 } 1267 }
1268 Thread.Sleep(3000);
1269 foreach (Packet enable in enablePackets)
1270 {
1271 this.OutPacket(enable);
1272 }
1273 enablePackets.Clear();
1268 } 1274 }
1269 } 1275 }
1270 } 1276 }
diff --git a/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim.RegionServer/world/SceneObject.cs
new file mode 100644
index 0000000..58454fd
--- /dev/null
+++ b/OpenSim.RegionServer/world/SceneObject.cs
@@ -0,0 +1,17 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.types;
5using libsecondlife;
6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Physics.Manager;
9using OpenSim.Framework.Types;
10using OpenSim.Framework.Inventory;
11
12namespace OpenSim.world
13{
14 public class SceneObject : Entity
15 {
16 }
17}
generated by cgit v1.1 at 2024-12-15 20:35:55 +0000