diff options
author | MW | 2007-06-20 17:32:21 +0000 |
---|---|---|
committer | MW | 2007-06-20 17:32:21 +0000 |
commit | 3e484d1aaf6d2d893f258e7372003de9bf5e8bdb (patch) | |
tree | 78eba8a9c1e77748d73d77e9f366021235a738b8 /OpenSim/Examples/SimpleApp | |
parent | * and done the same for OGS.. (diff) | |
download | opensim-SC_OLD-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.zip opensim-SC_OLD-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.gz opensim-SC_OLD-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.bz2 opensim-SC_OLD-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.xz |
Renamed Avatar to ScenePresence to avoid clash with libsl Avatar class.
Added ThirdPartyLicenses folder containing the licenses for the various third party libraries we use.
Plus some other small changes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Examples/SimpleApp/MyWorld.cs | 14 | ||||
-rw-r--r-- | OpenSim/Examples/SimpleApp/Program.cs | 6 | ||||
-rw-r--r-- | OpenSim/Examples/SimpleApp/SimpleApp.exe.build | 4 |
3 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs index bc7a3b0..334b6af 100644 --- a/OpenSim/Examples/SimpleApp/MyWorld.cs +++ b/OpenSim/Examples/SimpleApp/MyWorld.cs | |||
@@ -6,7 +6,7 @@ using OpenSim.Framework.Types; | |||
6 | using OpenSim.Framework.Console; | 6 | using OpenSim.Framework.Console; |
7 | using libsecondlife; | 7 | using libsecondlife; |
8 | using OpenSim.Region; | 8 | using OpenSim.Region; |
9 | using Avatar=OpenSim.Region.Scenes.Avatar; | 9 | using Avatar=OpenSim.Region.Scenes.ScenePresence; |
10 | using OpenSim.Region.Scenes; | 10 | using OpenSim.Region.Scenes; |
11 | using OpenSim.Framework; | 11 | using OpenSim.Framework; |
12 | using OpenSim.Caches; | 12 | using OpenSim.Caches; |
@@ -17,7 +17,7 @@ namespace SimpleApp | |||
17 | public class MyWorld : Scene | 17 | public class MyWorld : Scene |
18 | { | 18 | { |
19 | private RegionInfo m_regionInfo; | 19 | private RegionInfo m_regionInfo; |
20 | private List<OpenSim.Region.Scenes.Avatar> m_avatars; | 20 | private List<OpenSim.Region.Scenes.ScenePresence> m_avatars; |
21 | 21 | ||
22 | public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach) | 22 | public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach) |
23 | : base(clientThreads, regionInfo, authen, commsMan, assetCach) | 23 | : base(clientThreads, regionInfo, authen, commsMan, assetCach) |
@@ -43,7 +43,8 @@ namespace SimpleApp | |||
43 | 43 | ||
44 | #region IWorld Members | 44 | #region IWorld Members |
45 | 45 | ||
46 | override public void AddNewAvatar(IClientAPI client, LLUUID agentID, bool child) | 46 | override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child) |
47 | |||
47 | { | 48 | { |
48 | LLVector3 pos = new LLVector3(128, 128, 128); | 49 | LLVector3 pos = new LLVector3(128, 128, 128); |
49 | 50 | ||
@@ -65,7 +66,7 @@ namespace SimpleApp | |||
65 | 66 | ||
66 | client.OnCompleteMovementToRegion += delegate() | 67 | client.OnCompleteMovementToRegion += delegate() |
67 | { | 68 | { |
68 | client.SendAvatarData(m_regionInfo, client.FirstName, | 69 | client.SendAvatarData(m_regionInfo.RegionHandle, client.FirstName, |
69 | client.LastName, client.AgentId, 0, | 70 | client.LastName, client.AgentId, 0, |
70 | pos); | 71 | pos); |
71 | 72 | ||
@@ -74,7 +75,7 @@ namespace SimpleApp | |||
74 | 75 | ||
75 | client.SendRegionHandshake(m_regionInfo); | 76 | client.SendRegionHandshake(m_regionInfo); |
76 | 77 | ||
77 | OpenSim.Region.Scenes.Avatar avatar = new Avatar( client, this, m_regionInfo ); | 78 | OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo ); |
78 | 79 | ||
79 | } | 80 | } |
80 | 81 | ||
@@ -83,7 +84,8 @@ namespace SimpleApp | |||
83 | client.SendWearables( AvatarWearable.DefaultWearables ); | 84 | client.SendWearables( AvatarWearable.DefaultWearables ); |
84 | } | 85 | } |
85 | 86 | ||
86 | public void RemoveAvatar(LLUUID agentID) | 87 | |
88 | override public void RemoveClient(LLUUID agentID) | ||
87 | { | 89 | { |
88 | 90 | ||
89 | } | 91 | } |
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs index b0b68d9..6d89cbe 100644 --- a/OpenSim/Examples/SimpleApp/Program.cs +++ b/OpenSim/Examples/SimpleApp/Program.cs | |||
@@ -19,13 +19,13 @@ namespace SimpleApp | |||
19 | { | 19 | { |
20 | class Program : IAssetReceiver, conscmd_callback | 20 | class Program : IAssetReceiver, conscmd_callback |
21 | { | 21 | { |
22 | private ConsoleBase m_console; | 22 | private LogBase m_console; |
23 | AuthenticateSessionsBase m_circuitManager; | 23 | AuthenticateSessionsBase m_circuitManager; |
24 | 24 | ||
25 | private void Run() | 25 | private void Run() |
26 | { | 26 | { |
27 | m_console = new ConsoleBase(null, "SimpleApp", this, false); | 27 | m_console = new LogBase(null, "SimpleApp", this, false); |
28 | MainConsole.Instance = m_console; | 28 | MainLog.Instance = m_console; |
29 | 29 | ||
30 | CheckSumServer checksumServer = new CheckSumServer(12036); | 30 | CheckSumServer checksumServer = new CheckSumServer(12036); |
31 | checksumServer.ServerListener(); | 31 | checksumServer.ServerListener(); |
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build index b024219..087922b 100644 --- a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build +++ b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build | |||
@@ -21,13 +21,15 @@ | |||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="../../../bin/libsecondlife.dll" /> | 23 | <include name="../../../bin/libsecondlife.dll" /> |
24 | <include name="../../../bin/OpenGrid.Framework.Communications.dll" /> | ||
24 | <include name="../../../bin/OpenSim.Caches.dll" /> | 25 | <include name="../../../bin/OpenSim.Caches.dll" /> |
25 | <include name="../../../bin/OpenSim.Framework.dll" /> | 26 | <include name="../../../bin/OpenSim.Framework.dll" /> |
26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> |
27 | <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" /> | 28 | <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" /> |
29 | <include name="../../../bin/OpenSim.LocalCommunications.dll" /> | ||
30 | <include name="../../../bin/OpenSim.Region.dll" /> | ||
28 | <include name="../../../bin/OpenSim.RegionServer.dll" /> | 31 | <include name="../../../bin/OpenSim.RegionServer.dll" /> |
29 | <include name="../../../bin/OpenSim.Servers.dll" /> | 32 | <include name="../../../bin/OpenSim.Servers.dll" /> |
30 | <include name="OpenSim.World.dll" /> | ||
31 | <include name="System.dll" /> | 33 | <include name="System.dll" /> |
32 | <include name="System.Data.dll.dll" /> | 34 | <include name="System.Data.dll.dll" /> |
33 | <include name="System.Xml.dll" /> | 35 | <include name="System.Xml.dll" /> |