aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim.sln6
-rw-r--r--OpenSim/Examples/SimpleApp/MyWorld.cs29
-rw-r--r--OpenSim/Examples/SimpleApp/Program.cs8
-rw-r--r--OpenSim/Examples/SimpleApp/SimpleApp.csproj22
-rw-r--r--OpenSim/Examples/SimpleApp2/MyClientView.cs70
-rw-r--r--OpenSim/Examples/SimpleApp2/MyPacketServer.cs32
-rw-r--r--OpenSim/Examples/SimpleApp2/Program.cs178
-rw-r--r--OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs33
-rw-r--r--OpenSim/Examples/SimpleApp2/SimpleApp2.csproj154
-rw-r--r--OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build53
-rw-r--r--OpenSim/OpenSim.Region/ParcelManager.cs4
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Avatar.cs8
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Entity.cs10
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Primitive.cs8
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs2
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs8
-rw-r--r--OpenSim/OpenSim.Region/Scenes/Scene.cs2
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj6
-rw-r--r--prebuild.xml43
20 files changed, 80 insertions, 598 deletions
diff --git a/OpenSim.sln b/OpenSim.sln
index aa25a9e..d1e89a6 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -48,8 +48,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrai
48EndProject 48EndProject
49Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}" 49Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
50EndProject 50EndProject
51Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp2", "OpenSim\Examples\SimpleApp2\SimpleApp2.csproj", "{24DF2448-0000-0000-0000-000000000000}"
52EndProject
53Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" 51Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
54EndProject 52EndProject
55Global 53Global
@@ -154,10 +152,6 @@ Global
154 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 152 {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
155 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 153 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
156 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 154 {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
157 {24DF2448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158 {24DF2448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
159 {24DF2448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
160 {24DF2448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
161 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 155 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
162 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 156 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
163 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 157 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs
index d3da1c7..bc7a3b0 100644
--- a/OpenSim/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Examples/SimpleApp/MyWorld.cs
@@ -5,19 +5,28 @@ using OpenSim.Framework.Interfaces;
5using OpenSim.Framework.Types; 5using OpenSim.Framework.Types;
6using OpenSim.Framework.Console; 6using OpenSim.Framework.Console;
7using libsecondlife; 7using libsecondlife;
8using OpenSim.Region;
9using Avatar=OpenSim.Region.Scenes.Avatar;
10using OpenSim.Region.Scenes;
11using OpenSim.Framework;
12using OpenSim.Caches;
13using OpenGrid.Framework.Communications;
8 14
9namespace SimpleApp 15namespace SimpleApp
10{ 16{
11 public class MyWorld : IWorld 17 public class MyWorld : Scene
12 { 18 {
13 private RegionInfo m_regionInfo; 19 private RegionInfo m_regionInfo;
20 private List<OpenSim.Region.Scenes.Avatar> m_avatars;
14 21
15 public MyWorld(RegionInfo regionInfo) 22 public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach)
23 : base(clientThreads, regionInfo, authen, commsMan, assetCach)
16 { 24 {
17 m_regionInfo = regionInfo; 25 m_regionInfo = regionInfo;
26 m_avatars = new List<Avatar>();
18 } 27 }
19 28
20 private void SendLayerData(IClientAPI remoteClient) 29 public override void SendLayerData(IClientAPI remoteClient)
21 { 30 {
22 float[] map = new float[65536]; 31 float[] map = new float[65536];
23 32
@@ -34,7 +43,7 @@ namespace SimpleApp
34 43
35 #region IWorld Members 44 #region IWorld Members
36 45
37 void IWorld.AddNewAvatar(IClientAPI client, LLUUID agentID, bool child) 46 override public void AddNewAvatar(IClientAPI client, LLUUID agentID, bool child)
38 { 47 {
39 LLVector3 pos = new LLVector3(128, 128, 128); 48 LLVector3 pos = new LLVector3(128, 128, 128);
40 49
@@ -65,6 +74,8 @@ namespace SimpleApp
65 74
66 client.SendRegionHandshake(m_regionInfo); 75 client.SendRegionHandshake(m_regionInfo);
67 76
77 OpenSim.Region.Scenes.Avatar avatar = new Avatar( client, this, m_regionInfo );
78
68 } 79 }
69 80
70 private void SendWearables( IClientAPI client ) 81 private void SendWearables( IClientAPI client )
@@ -72,30 +83,28 @@ namespace SimpleApp
72 client.SendWearables( AvatarWearable.DefaultWearables ); 83 client.SendWearables( AvatarWearable.DefaultWearables );
73 } 84 }
74 85
75 void IWorld.RemoveAvatar(LLUUID agentID) 86 public void RemoveAvatar(LLUUID agentID)
76 { 87 {
77 88
78 } 89 }
79 90
80 RegionInfo IWorld.RegionInfo 91 public RegionInfo RegionInfo
81 { 92 {
82 get { return m_regionInfo; } 93 get { return m_regionInfo; }
83 } 94 }
84 95
85 object IWorld.SyncRoot 96 public object SyncRoot
86 { 97 {
87 get { return this; } 98 get { return this; }
88 } 99 }
89 100
90 private uint m_nextLocalId = 1; 101 private uint m_nextLocalId = 1;
91 102
92 uint IWorld.NextLocalId 103 public uint NextLocalId
93 { 104 {
94 get { return m_nextLocalId++; } 105 get { return m_nextLocalId++; }
95 } 106 }
96 107
97 #endregion 108 #endregion
98
99
100 } 109 }
101} 110}
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index 1d0702d..b0b68d9 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -12,6 +12,8 @@ using OpenSim.UserServer;
12using OpenSim.Servers; 12using OpenSim.Servers;
13using OpenSim.Framework; 13using OpenSim.Framework;
14using OpenSim.Caches; 14using OpenSim.Caches;
15using OpenGrid.Framework.Communications;
16using OpenSim.LocalCommunications;
15 17
16namespace SimpleApp 18namespace SimpleApp
17{ 19{
@@ -51,9 +53,11 @@ namespace SimpleApp
51 53
52 ClientView.TerrainManager = new TerrainManager(new SecondLife()); 54 ClientView.TerrainManager = new TerrainManager(new SecondLife());
53 55
54 RegionInfo regionInfo = new RegionInfo(); 56 CommunicationsManager communicationsManager = new CommunicationsLocal();
57
58 RegionInfo regionInfo = new RegionInfo( );
55 59
56 udpServer.LocalWorld = new MyWorld( regionInfo ); 60 udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache );
57 61
58 // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo); 62 // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);
59 // PhysicsScene physicsScene = new NullPhysicsScene(); 63 // PhysicsScene physicsScene = new NullPhysicsScene();
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
index 810ecd4..00af44a 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
@@ -62,10 +62,6 @@
62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 63 <Private>False</Private>
64 </Reference> 64 </Reference>
65 <Reference Include="OpenSim.World" >
66 <HintPath>OpenSim.World.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="System" > 65 <Reference Include="System" >
70 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
71 <Private>False</Private> 67 <Private>False</Private>
@@ -80,6 +76,12 @@
80 </Reference> 76 </Reference>
81 </ItemGroup> 77 </ItemGroup>
82 <ItemGroup> 78 <ItemGroup>
79 <ProjectReference Include="..\..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
80 <Name>OpenGrid.Framework.Communications</Name>
81 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private>
84 </ProjectReference>
83 <ProjectReference Include="..\..\OpenSim.Caches\OpenSim.Caches.csproj"> 85 <ProjectReference Include="..\..\OpenSim.Caches\OpenSim.Caches.csproj">
84 <Name>OpenSim.Caches</Name> 86 <Name>OpenSim.Caches</Name>
85 <Project>{1938EB12-0000-0000-0000-000000000000}</Project> 87 <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
@@ -104,6 +106,18 @@
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private> 107 <Private>False</Private>
106 </ProjectReference> 108 </ProjectReference>
109 <ProjectReference Include="..\..\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj">
110 <Name>OpenSim.LocalCommunications</Name>
111 <Project>{79CED992-0000-0000-0000-000000000000}</Project>
112 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
113 <Private>False</Private>
114 </ProjectReference>
115 <ProjectReference Include="..\..\OpenSim.Region\OpenSim.Region.csproj">
116 <Name>OpenSim.Region</Name>
117 <Project>{196916AF-0000-0000-0000-000000000000}</Project>
118 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
119 <Private>False</Private>
120 </ProjectReference>
107 <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> 121 <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
108 <Name>OpenSim.RegionServer</Name> 122 <Name>OpenSim.RegionServer</Name>
109 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> 123 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
diff --git a/OpenSim/Examples/SimpleApp2/MyClientView.cs b/OpenSim/Examples/SimpleApp2/MyClientView.cs
deleted file mode 100644
index 4ef3c94..0000000
--- a/OpenSim/Examples/SimpleApp2/MyClientView.cs
+++ /dev/null
@@ -1,70 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim;
5using libsecondlife;
6using OpenSim.Framework.Interfaces;
7using System.Net;
8using libsecondlife.Packets;
9using OpenSim.Assets;
10using OpenSim.Framework.Types;
11using OpenSim.Framework;
12using OpenSim.Caches;
13
14namespace SimpleApp2
15{
16 public class MyClientView : ClientView
17 {
18 private float[] m_map;
19 private Dictionary<uint, IClientAPI> m_clientAPIs;
20
21 public MyClientView(float[] map, Dictionary<uint, IClientAPI> clientAPIs, EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
22 : base(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions)
23 {
24 m_map = map;
25 m_clientAPIs = clientAPIs;
26
27 OnRegionHandShakeReply += RegionHandShakeReplyHandler;
28 OnChatFromViewer += ChatHandler;
29 OnRequestWearables += RequestWearablesHandler;
30 OnCompleteMovementToRegion += CompleteMovementToRegionHandler;
31 }
32
33 private void ChatHandler(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
34 {
35 // Echo it (so you know what you typed)
36 SendChatMessage(message, type, fromPos, fromName, fromAgentID);
37 SendChatMessage("Ready.", 1, fromPos, "System", LLUUID.Zero);
38 }
39
40 private void CompleteMovementToRegionHandler()
41 {
42 LLVector3 pos = new LLVector3(128, 128, 128);
43
44 MoveAgentIntoRegion(m_world.RegionInfo, pos, LLVector3.Zero );
45
46 SendAvatarData( m_world.RegionInfo, FirstName,
47 LastName, AgentId, 0,
48 pos);
49
50 SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero);
51
52
53
54 // OpenSim.world.Primitive prim = new OpenSim.world.Primitive( m_clientAPIs, m_world.RegionInfo.RegionHandle, m_world, AgentId );
55
56 // SendNewPrim( prim );
57
58 }
59
60 private void RegionHandShakeReplyHandler(IClientAPI client)
61 {
62 client.SendLayerData(m_map);
63 }
64
65 private void RequestWearablesHandler(IClientAPI client)
66 {
67 SendWearables(AvatarWearable.DefaultWearables);
68 }
69 }
70}
diff --git a/OpenSim/Examples/SimpleApp2/MyPacketServer.cs b/OpenSim/Examples/SimpleApp2/MyPacketServer.cs
deleted file mode 100644
index 67878c4..0000000
--- a/OpenSim/Examples/SimpleApp2/MyPacketServer.cs
+++ /dev/null
@@ -1,32 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim;
5using OpenSim.Assets;
6using System.Net;
7using libsecondlife.Packets;
8using OpenSim.Framework.Interfaces;
9using OpenSim.Framework;
10using OpenSim.Caches;
11
12namespace SimpleApp2
13{
14 public class MyPacketServer : PacketServer
15 {
16 private float[] m_map;
17
18 public MyPacketServer(float[] map, ClientStackNetworkHandler networkHandler, uint port)
19 : base(networkHandler, port)
20 {
21 m_map = map;
22 }
23
24 protected override ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
25 {
26 // (EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
27
28
29 return new MyClientView(m_map, ClientAPIs, remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions);
30 }
31 }
32}
diff --git a/OpenSim/Examples/SimpleApp2/Program.cs b/OpenSim/Examples/SimpleApp2/Program.cs
deleted file mode 100644
index 85ce703..0000000
--- a/OpenSim/Examples/SimpleApp2/Program.cs
+++ /dev/null
@@ -1,178 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim;
5using OpenSim.Servers;
6using OpenSim.GridInterfaces.Local;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types;
9using OpenSim.UserServer;
10using OpenSim.Framework.Console;
11using OpenSim.Assets;
12using libsecondlife;
13using OpenSim.Framework;
14using OpenSim.Caches;
15
16namespace SimpleApp2
17{
18 class Program : IWorld, IAssetReceiver, conscmd_callback
19 {
20 private ConsoleBase m_console;
21 private RegionInfo m_regionInfo;
22 private float[] m_map;
23 private AuthenticateSessionsBase m_circuitManager;
24
25 private void Run()
26 {
27 m_console = new ConsoleBase(null, "SimpleApp", this, false);
28 MainConsole.Instance = m_console;
29
30 m_map = CreateMap();
31
32 CheckSumServer checksumServer = new CheckSumServer(12036);
33 checksumServer.ServerListener();
34
35 string simAddr = "127.0.0.1";
36 int simPort = 9000;
37
38 m_circuitManager = new AuthenticateSessionsBase();
39
40 LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false);
41 loginServer.Startup();
42
43 loginServer.SetSessionHandler( AddNewSessionHandler );
44
45 InventoryCache inventoryCache = new InventoryCache();
46
47 LocalAssetServer assetServer = new LocalAssetServer();
48 assetServer.SetServerInfo("http://127.0.0.1:8003/", "");
49 assetServer.SetReceiver(this);
50
51 AssetCache assetCache = new AssetCache(assetServer);
52
53 UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, m_circuitManager );
54 PacketServer packetServer = new MyPacketServer(m_map, udpServer, (uint) simPort );
55 udpServer.ServerListener();
56
57 ClientView.TerrainManager = new TerrainManager(new SecondLife());
58
59 m_regionInfo = new RegionInfo();
60
61 udpServer.LocalWorld = this;
62
63 // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);
64 // PhysicsScene physicsScene = new NullPhysicsScene();
65 // world.PhysicsScene = physicsScene;
66 // udpServer.LocalWorld = world;
67
68 BaseHttpServer httpServer = new BaseHttpServer(simPort);
69 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
70 httpServer.Start();
71
72 m_console.WriteLine(LogPriority.NORMAL, "Press enter to quit.");
73 m_console.ReadLine();
74 }
75
76 private float[] CreateMap()
77 {
78 float[] map = new float[65536];
79
80 for (int i = 0; i < 65536; i++)
81 {
82 int x = i % 256;
83 int y = i / 256;
84
85 map[i] = (float)(x + y / 2);
86 }
87
88 return map;
89 }
90
91 private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
92 {
93 m_console.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);
94
95 AgentCircuitData agent = new AgentCircuitData();
96 agent.AgentID = loginData.Agent;
97 agent.firstname = loginData.First;
98 agent.lastname = loginData.Last;
99 agent.SessionID = loginData.Session;
100 agent.SecureSessionID = loginData.SecureSession;
101 agent.circuitcode = loginData.CircuitCode;
102 agent.BaseFolder = loginData.BaseFolder;
103 agent.InventoryFolder = loginData.InventoryFolder;
104 agent.startpos = new LLVector3(128, 128, 70);
105
106 m_circuitManager.AddNewCircuit(agent.circuitcode, agent);
107
108 return true;
109 }
110
111 static void Main(string[] args)
112 {
113 Program app = new Program();
114
115 app.Run();
116 }
117
118
119 #region IWorld Members
120
121 void IWorld.AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)
122 {
123 remoteClient.SendRegionHandshake(m_regionInfo);
124 }
125
126 void IWorld.RemoveAvatar(LLUUID agentID)
127 {
128 throw new Exception("The method or operation is not implemented.");
129 }
130
131 RegionInfo IWorld.RegionInfo
132 {
133 get { return m_regionInfo; }
134 }
135
136 object IWorld.SyncRoot
137 {
138 get { return this; }
139 }
140
141 private uint m_nextLocalId = 1;
142
143 uint IWorld.NextLocalId
144 {
145 get { return m_nextLocalId++; }
146 }
147
148 #endregion
149
150 #region IAssetReceiver Members
151
152 public void AssetReceived(AssetBase asset, bool IsTexture)
153 {
154 throw new Exception("The method or operation is not implemented.");
155 }
156
157 public void AssetNotFound(AssetBase asset)
158 {
159 throw new Exception("The method or operation is not implemented.");
160 }
161
162 #endregion
163
164 #region conscmd_callback Members
165
166 public void RunCmd(string cmd, string[] cmdparams)
167 {
168 throw new Exception("The method or operation is not implemented.");
169 }
170
171 public void Show(string ShowWhat)
172 {
173 throw new Exception("The method or operation is not implemented.");
174 }
175
176 #endregion
177 }
178}
diff --git a/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs b/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs
deleted file mode 100644
index f7d6aae..0000000
--- a/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly.
8[assembly: AssemblyTitle("SimpleApp2")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("Playahead AB")]
12[assembly: AssemblyProduct("SimpleApp2")]
13[assembly: AssemblyCopyright("Copyright © Playahead AB 2007")]
14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")]
16
17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)]
21
22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("bdda0707-02b4-46ca-87ce-ab3c12558a4a")]
24
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32[assembly: AssemblyVersion("1.0.0.0")]
33[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
deleted file mode 100644
index 5c6e192..0000000
--- a/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
+++ /dev/null
@@ -1,154 +0,0 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{24DF2448-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName>
13 <AssemblyName>SimpleApp2</AssemblyName>
14 <DefaultClientScript>JScript</DefaultClientScript>
15 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign>
18 <OutputType>Exe</OutputType>
19 <AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>SimpleApp2</RootNamespace>
22 <StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags>
25 </FileUpgradeFlags>
26 </PropertyGroup>
27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
28 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
29 <BaseAddress>285212672</BaseAddress>
30 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
31 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize>
39 <OutputPath>..\..\..\bin\</OutputPath>
40 <RegisterForComInterop>False</RegisterForComInterop>
41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel>
44 <NoWarn>
45 </NoWarn>
46 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
49 <BaseAddress>285212672</BaseAddress>
50 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
51 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize>
59 <OutputPath>..\..\..\bin\</OutputPath>
60 <RegisterForComInterop>False</RegisterForComInterop>
61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel>
64 <NoWarn>
65 </NoWarn>
66 </PropertyGroup>
67 <ItemGroup>
68 <Reference Include="libsecondlife.dll">
69 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private>
71 </Reference>
72 <Reference Include="OpenSim.World">
73 <HintPath>OpenSim.World.dll</HintPath>
74 <Private>False</Private>
75 </Reference>
76 <Reference Include="System">
77 <HintPath>System.dll</HintPath>
78 <Private>False</Private>
79 </Reference>
80 <Reference Include="System.Data.dll">
81 <HintPath>..\..\..\bin\System.Data.dll</HintPath>
82 <Private>False</Private>
83 </Reference>
84 <Reference Include="System.Xml">
85 <HintPath>System.Xml.dll</HintPath>
86 <Private>False</Private>
87 </Reference>
88 </ItemGroup>
89 <ItemGroup>
90 <ProjectReference Include="..\..\OpenSim.Caches\OpenSim.Caches.csproj">
91 <Name>OpenSim.Caches</Name>
92 <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
93 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
94 <Private>False</Private>
95 </ProjectReference>
96 <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
97 <Name>OpenSim.Framework</Name>
98 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
99 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
100 <Private>False</Private>
101 </ProjectReference>
102 <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
103 <Name>OpenSim.Framework.Console</Name>
104 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
105 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
106 <Private>False</Private>
107 </ProjectReference>
108 <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">
109 <Name>OpenSim.GridInterfaces.Local</Name>
110 <Project>{546099CD-0000-0000-0000-000000000000}</Project>
111 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
112 <Private>False</Private>
113 </ProjectReference>
114 <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
115 <Name>OpenSim.RegionServer</Name>
116 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
117 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
118 <Private>False</Private>
119 </ProjectReference>
120 <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
121 <Name>OpenSim.Servers</Name>
122 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
123 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
124 <Private>False</Private>
125 </ProjectReference>
126 <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">
127 <Name>XMLRPC</Name>
128 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
129 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
130 <Private>False</Private>
131 </ProjectReference>
132 </ItemGroup>
133 <ItemGroup>
134 <Compile Include="MyClientView.cs">
135 <SubType>Code</SubType>
136 </Compile>
137 <Compile Include="MyPacketServer.cs">
138 <SubType>Code</SubType>
139 </Compile>
140 <Compile Include="Program.cs">
141 <SubType>Code</SubType>
142 </Compile>
143 <Compile Include="Properties\AssemblyInfo.cs">
144 <SubType>Code</SubType>
145 </Compile>
146 </ItemGroup>
147 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
148 <PropertyGroup>
149 <PreBuildEvent>
150 </PreBuildEvent>
151 <PostBuildEvent>
152 </PostBuildEvent>
153 </PropertyGroup>
154</Project> \ No newline at end of file
diff --git a/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build b/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build
deleted file mode 100644
index dc5cc2a..0000000
--- a/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build
+++ /dev/null
@@ -1,53 +0,0 @@
1<?xml version="1.0" ?>
2<project name="SimpleApp2" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
11 <resources prefix="SimpleApp2" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="MyClientView.cs" />
15 <include name="MyPacketServer.cs" />
16 <include name="Program.cs" />
17 <include name="Properties/AssemblyInfo.cs" />
18 </sources>
19 <references basedir="${project::get-base-directory()}">
20 <lib>
21 <include name="${project::get-base-directory()}" />
22 <include name="${project::get-base-directory()}/${build.dir}" />
23 </lib>
24 <include name="../../../bin/libsecondlife.dll" />
25 <include name="../../../bin/OpenSim.Caches.dll" />
26 <include name="../../../bin/OpenSim.Framework.dll" />
27 <include name="../../../bin/OpenSim.Framework.Console.dll" />
28 <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />
29 <include name="../../../bin/OpenSim.RegionServer.dll" />
30 <include name="../../../bin/OpenSim.Servers.dll" />
31 <include name="OpenSim.World.dll" />
32 <include name="System.dll" />
33 <include name="System.Data.dll.dll" />
34 <include name="System.Xml.dll" />
35 <include name="../../../bin/XMLRPC.dll" />
36 </references>
37 </csc>
38 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
39 <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
40 <copy todir="${project::get-base-directory()}/../../../bin/">
41 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
42 <include name="*.dll"/>
43 <include name="*.exe"/>
44 </fileset>
45 </copy>
46 </target>
47 <target name="clean">
48 <delete dir="${bin.dir}" failonerror="false" />
49 <delete dir="${obj.dir}" failonerror="false" />
50 </target>
51 <target name="doc" description="Creates documentation.">
52 </target>
53</project>
diff --git a/OpenSim/OpenSim.Region/ParcelManager.cs b/OpenSim/OpenSim.Region/ParcelManager.cs
index ce53d24..3b0785f 100644
--- a/OpenSim/OpenSim.Region/ParcelManager.cs
+++ b/OpenSim/OpenSim.Region/ParcelManager.cs
@@ -237,7 +237,7 @@ namespace OpenSim.Region
237 } 237 }
238 } 238 }
239 } 239 }
240 catch (Exception e) 240 catch (Exception)
241 { 241 {
242 return false; //Exception. For now, lets skip subdivision 242 return false; //Exception. For now, lets skip subdivision
243 } 243 }
@@ -294,7 +294,7 @@ namespace OpenSim.Region
294 startParcel = getParcel(start_x, start_y); 294 startParcel = getParcel(start_x, start_y);
295 endParcel = getParcel(end_x, end_y); 295 endParcel = getParcel(end_x, end_y);
296 } 296 }
297 catch (Exception e) 297 catch (Exception)
298 { 298 {
299 return false; //Error occured when trying to get the start and end parcels 299 return false; //Error occured when trying to get the start and end parcels
300 } 300 }
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs b/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs
index 534bda4..8b27efe 100644
--- a/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Avatar.Update.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Scenes
87 /// </summary> 87 /// </summary>
88 public void SendInitialPosition() 88 public void SendInitialPosition()
89 { 89 {
90 this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.localid, this.Pos); 90 this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.LocalId, this.Pos);
91 } 91 }
92 92
93 /// <summary> 93 /// <summary>
diff --git a/OpenSim/OpenSim.Region/Scenes/Avatar.cs b/OpenSim/OpenSim.Region/Scenes/Avatar.cs
index 6b393a8..3e371f0 100644
--- a/OpenSim/OpenSim.Region/Scenes/Avatar.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Avatar.cs
@@ -59,7 +59,6 @@ namespace OpenSim.Region.Scenes
59 private AvatarWearable[] Wearables; 59 private AvatarWearable[] Wearables;
60 private LLVector3 positionLastFrame = new LLVector3(0, 0, 0); 60 private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
61 private ulong m_regionHandle; 61 private ulong m_regionHandle;
62 private Dictionary<uint, IClientAPI> m_clientThreads;
63 private bool childAvatar = false; 62 private bool childAvatar = false;
64 private bool newForce = false; 63 private bool newForce = false;
65 64
@@ -71,11 +70,10 @@ namespace OpenSim.Region.Scenes
71 /// <param name="world"></param> 70 /// <param name="world"></param>
72 /// <param name="clientThreads"></param> 71 /// <param name="clientThreads"></param>
73 /// <param name="regionDat"></param> 72 /// <param name="regionDat"></param>
74 public Avatar(IClientAPI theClient, Scene world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo reginfo) 73 public Avatar(IClientAPI theClient, Scene world, RegionInfo reginfo)
75 { 74 {
76 75
77 m_world = world; 76 m_world = world;
78 m_clientThreads = clientThreads;
79 this.uuid = theClient.AgentId; 77 this.uuid = theClient.AgentId;
80 78
81 m_regionInfo = reginfo; 79 m_regionInfo = reginfo;
@@ -84,7 +82,7 @@ namespace OpenSim.Region.Scenes
84 ControllingClient = theClient; 82 ControllingClient = theClient;
85 this.firstname = ControllingClient.FirstName; 83 this.firstname = ControllingClient.FirstName;
86 this.lastname = ControllingClient.LastName; 84 this.lastname = ControllingClient.LastName;
87 localid = this.m_world.NextLocalId; 85 m_localId = m_world.NextLocalId;
88 Pos = ControllingClient.StartPos; 86 Pos = ControllingClient.StartPos;
89 visualParams = new byte[218]; 87 visualParams = new byte[218];
90 for (int i = 0; i < 218; i++) 88 for (int i = 0; i < 218; i++)
@@ -196,7 +194,7 @@ namespace OpenSim.Region.Scenes
196 { 194 {
197 LLVector3 pos = this.Pos; 195 LLVector3 pos = this.Pos;
198 LLVector3 vel = this.Velocity; 196 LLVector3 vel = this.Velocity;
199 RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.localid, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z)); 197 RemoteClient.SendAvatarTerseUpdate(this.m_regionHandle, 64096, this.LocalId, new LLVector3(pos.X, pos.Y, pos.Z), new LLVector3(vel.X, vel.Y, vel.Z));
200 } 198 }
201 199
202 /// <summary> 200 /// <summary>
diff --git a/OpenSim/OpenSim.Region/Scenes/Entity.cs b/OpenSim/OpenSim.Region/Scenes/Entity.cs
index 007bdaf..2376fc4 100644
--- a/OpenSim/OpenSim.Region/Scenes/Entity.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Entity.cs
@@ -38,7 +38,6 @@ namespace OpenSim.Region.Scenes
38 public abstract class Entity : IScriptReadonlyEntity 38 public abstract class Entity : IScriptReadonlyEntity
39 { 39 {
40 public libsecondlife.LLUUID uuid; 40 public libsecondlife.LLUUID uuid;
41 public uint localid;
42 public LLVector3 velocity; 41 public LLVector3 velocity;
43 public Quaternion rotation; 42 public Quaternion rotation;
44 protected List<Entity> children; 43 protected List<Entity> children;
@@ -128,13 +127,20 @@ namespace OpenSim.Region.Scenes
128 } 127 }
129 } 128 }
130 129
130 protected uint m_localId;
131
132 public uint LocalId
133 {
134 get { return m_localId; }
135 }
136
131 /// <summary> 137 /// <summary>
132 /// Creates a new Entity (should not occur on it's own) 138 /// Creates a new Entity (should not occur on it's own)
133 /// </summary> 139 /// </summary>
134 public Entity() 140 public Entity()
135 { 141 {
136 uuid = new libsecondlife.LLUUID(); 142 uuid = new libsecondlife.LLUUID();
137 localid = 0; 143
138 m_pos = new LLVector3(); 144 m_pos = new LLVector3();
139 velocity = new LLVector3(); 145 velocity = new LLVector3();
140 rotation = new Quaternion(); 146 rotation = new Quaternion();
diff --git a/OpenSim/OpenSim.Region/Scenes/Primitive.cs b/OpenSim/OpenSim.Region/Scenes/Primitive.cs
index 9bccfd3..929f0b5 100644
--- a/OpenSim/OpenSim.Region/Scenes/Primitive.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Primitive.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Scenes
136 this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; 136 this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
137 this.primData.OwnerID = owner; 137 this.primData.OwnerID = owner;
138 this.primData.FullID = this.uuid = fullID; 138 this.primData.FullID = this.uuid = fullID;
139 this.primData.LocalID = this.localid = localID; 139 this.primData.LocalID = m_localId = localID;
140 } 140 }
141 141
142 /// <summary> 142 /// <summary>
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Scenes
156 inventoryItems = new Dictionary<LLUUID, InventoryItem>(); 156 inventoryItems = new Dictionary<LLUUID, InventoryItem>();
157 this.primData = PrimData.DefaultCube(); 157 this.primData = PrimData.DefaultCube();
158 this.primData.OwnerID = owner; 158 this.primData.OwnerID = owner;
159 this.primData.LocalID = this.localid = localID; 159 this.primData.LocalID = m_localId = localID;
160 this.Pos = this.primData.Position = position; 160 this.Pos = this.primData.Position = position;
161 161
162 this.updateFlag = 1; 162 this.updateFlag = 1;
@@ -411,7 +411,7 @@ namespace OpenSim.Region.Scenes
411 lPos = this.Pos; 411 lPos = this.Pos;
412 } 412 }
413 413
414 remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.localid, this.primData, lPos, new LLUUID("00000000-0000-0000-5005-000000000005")); 414 remoteClient.SendPrimitiveToClient(this.m_regionHandle, 64096, this.LocalId, this.primData, lPos, new LLUUID("00000000-0000-0000-5005-000000000005"));
415 } 415 }
416 416
417 /// <summary> 417 /// <summary>
@@ -499,7 +499,7 @@ namespace OpenSim.Region.Scenes
499 PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin; 499 PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
500 LLVector3 pos1 = addPacket.ObjectData.RayEnd; 500 LLVector3 pos1 = addPacket.ObjectData.RayEnd;
501 this.primData.FullID = this.uuid = LLUUID.Random(); 501 this.primData.FullID = this.uuid = LLUUID.Random();
502 this.primData.LocalID = this.localid = (uint)(localID); 502 this.primData.LocalID = m_localId = (uint)(localID);
503 this.primData.Position = this.Pos = pos1; 503 this.primData.Position = this.Pos = pos1;
504 504
505 this.updateFlag = 1; 505 this.updateFlag = 1;
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs b/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
index 3d41200..35a3bda 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.PacketHandlers.cs
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Scenes
212 { 212 {
213 foreach (Entity ent in Entities.Values) 213 foreach (Entity ent in Entities.Values)
214 { 214 {
215 if (ent.localid == localID) 215 if (ent.LocalId == localID)
216 { 216 {
217 ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos); 217 ((OpenSim.Region.Scenes.Primitive)ent).UpdatePosition(pos);
218 break; 218 break;
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs b/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
index 50df16e..6317e43 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.Scripting.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Scenes
107 { 107 {
108 if(this.scriptEngines.ContainsKey(scriptType)) 108 if(this.scriptEngines.ContainsKey(scriptType))
109 { 109 {
110 this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.localid); 110 this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.LocalId);
111 } 111 }
112 } 112 }
113 113
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Scenes
124 // Console.WriteLine("script- getting entity " + localID + " position"); 124 // Console.WriteLine("script- getting entity " + localID + " position");
125 foreach (Entity entity in this.Entities.Values) 125 foreach (Entity entity in this.Entities.Values)
126 { 126 {
127 if (entity.localid == localID) 127 if (entity.LocalId == localID)
128 { 128 {
129 res.X = entity.Pos.X; 129 res.X = entity.Pos.X;
130 res.Y = entity.Pos.Y; 130 res.Y = entity.Pos.Y;
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Scenes
145 { 145 {
146 foreach (Entity entity in this.Entities.Values) 146 foreach (Entity entity in this.Entities.Values)
147 { 147 {
148 if (entity.localid == localID && entity is Primitive) 148 if (entity.LocalId == localID && entity is Primitive)
149 { 149 {
150 LLVector3 pos = entity.Pos; 150 LLVector3 pos = entity.Pos;
151 pos.X = x; 151 pos.X = x;
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Scenes
171 { 171 {
172 if (entity is Avatar) 172 if (entity is Avatar)
173 { 173 {
174 res = entity.localid; 174 res = entity.LocalId;
175 } 175 }
176 } 176 }
177 return res; 177 return res;
diff --git a/OpenSim/OpenSim.Region/Scenes/Scene.cs b/OpenSim/OpenSim.Region/Scenes/Scene.cs
index cb3865f..724d215 100644
--- a/OpenSim/OpenSim.Region/Scenes/Scene.cs
+++ b/OpenSim/OpenSim.Region/Scenes/Scene.cs
@@ -564,7 +564,7 @@ namespace OpenSim.Region.Scenes
564 try 564 try
565 { 565 {
566 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); 566 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
567 newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo); 567 newAvatar = new Avatar(remoteClient, this, this.m_regInfo);
568 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); 568 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
569 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); 569 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
570 570
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 63eeb9c..e569187 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -110,6 +110,12 @@
110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
111 <Private>False</Private> 111 <Private>False</Private>
112 </ProjectReference> 112 </ProjectReference>
113 <ProjectReference Include="..\OpenSim.Region\OpenSim.Region.csproj">
114 <Name>OpenSim.Region</Name>
115 <Project>{196916AF-0000-0000-0000-000000000000}</Project>
116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
117 <Private>False</Private>
118 </ProjectReference>
113 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> 119 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
114 <Name>OpenSim.Servers</Name> 120 <Name>OpenSim.Servers</Name>
115 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 121 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
diff --git a/prebuild.xml b/prebuild.xml
index a8f4010..65c6197 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -540,7 +540,6 @@
540 </Files> 540 </Files>
541 </Project> 541 </Project>
542 542
543
544 <Project name="OpenSim.RegionServer" path="OpenSim/OpenSim.RegionServer" type="Library"> 543 <Project name="OpenSim.RegionServer" path="OpenSim/OpenSim.RegionServer" type="Library">
545 <Configuration name="Debug"> 544 <Configuration name="Debug">
546 <Options> 545 <Options>
@@ -564,6 +563,7 @@
564 <Reference name="OpenSim.Framework.Console"/> 563 <Reference name="OpenSim.Framework.Console"/>
565 <Reference name="OpenSim.GenericConfig.Xml"/> 564 <Reference name="OpenSim.GenericConfig.Xml"/>
566 <Reference name="OpenSim.Physics.Manager"/> 565 <Reference name="OpenSim.Physics.Manager"/>
566 <Reference name="OpenSim.Region"/>
567 <Reference name="OpenSim.Servers"/> 567 <Reference name="OpenSim.Servers"/>
568 <Reference name="OpenSim.Caches"/> 568 <Reference name="OpenSim.Caches"/>
569 <Reference name="XMLRPC"/> 569 <Reference name="XMLRPC"/>
@@ -574,6 +574,7 @@
574 </Project> 574 </Project>
575 575
576 576
577
577 <Project name="OpenSim.Region" path="OpenSim/OpenSim.Region" type="Library"> 578 <Project name="OpenSim.Region" path="OpenSim/OpenSim.Region" type="Library">
578 <Configuration name="Debug"> 579 <Configuration name="Debug">
579 <Options> 580 <Options>
@@ -631,7 +632,7 @@
631 <Reference name="OpenSim.Framework.Console"/> 632 <Reference name="OpenSim.Framework.Console"/>
632 <Reference name="OpenSim.Physics.Manager"/> 633 <Reference name="OpenSim.Physics.Manager"/>
633 <Reference name="OpenSim.Servers"/> 634 <Reference name="OpenSim.Servers"/>
634 <Reference name="OpenSim.Region"/> 635 <Reference name="OpenSim.Region"/>
635 <Reference name="OpenSim.RegionServer"/> 636 <Reference name="OpenSim.RegionServer"/>
636 <Reference name="OpenSim.GenericConfig.Xml"/> 637 <Reference name="OpenSim.GenericConfig.Xml"/>
637 <Reference name="OpenGrid.Framework.Communications"/> 638 <Reference name="OpenGrid.Framework.Communications"/>
@@ -670,42 +671,12 @@
670 <Reference name="XMLRPC"/> 671 <Reference name="XMLRPC"/>
671 <Reference name="OpenSim.GridInterfaces.Local"/> 672 <Reference name="OpenSim.GridInterfaces.Local"/>
672 <Reference name="OpenSim.Servers"/> 673 <Reference name="OpenSim.Servers"/>
674<Reference name="OpenGrid.Framework.Communications"/>
675<Reference name="OpenSim.LocalCommunications"/>
673 <Reference name="OpenSim.Caches"/> 676 <Reference name="OpenSim.Caches"/>
674 <Reference name="OpenSim.RegionServer"/> 677 <Reference name="OpenSim.RegionServer"/>
675 <Reference name="OpenSim.World"/> 678 <Reference name="OpenSim.Region"/>
676 679
677 <Files>
678 <Match pattern="*.cs" recurse="true"/>
679 </Files>
680 </Project>
681
682 <Project name="SimpleApp2" path="OpenSim/Examples/SimpleApp2" type="Exe">
683 <Configuration name="Debug">
684 <Options>
685 <OutputPath>../../../bin/</OutputPath>
686 </Options>
687 </Configuration>
688 <Configuration name="Release">
689 <Options>
690 <OutputPath>../../../bin/</OutputPath>
691 </Options>
692 </Configuration>
693
694 <ReferencePath>../../../bin/</ReferencePath>
695
696 <Reference name="libsecondlife.dll"/>
697 <Reference name="System" localCopy="false"/>
698 <Reference name="System.Data.dll"/>
699 <Reference name="System.Xml"/>
700
701 <Reference name="OpenSim.Framework.Console"/>
702 <Reference name="OpenSim.Framework"/>
703 <Reference name="XMLRPC"/>
704 <Reference name="OpenSim.GridInterfaces.Local"/>
705 <Reference name="OpenSim.Servers"/>
706 <Reference name="OpenSim.Caches"/>
707 <Reference name="OpenSim.RegionServer"/>
708 <Reference name="OpenSim.World"/>
709 680
710 <Files> 681 <Files>
711 <Match pattern="*.cs" recurse="true"/> 682 <Match pattern="*.cs" recurse="true"/>
generated by cgit v1.1 at 2024-11-11 12:55:14 +0000