ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-21 15:35:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed Avatar to ScenePresence to avoid clash with libsl Avatar class.

Browse Source 
Added ThirdPartyLicenses folder containing the licenses for the various third party libraries we use.
Plus some other small changes.
This commit is contained in:
MW
2007-06-20 17:32:21 +00:00
parent a9e9bc83ef
commit 3e484d1aaf
36 changed files with 588 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Examples/SimpleApp/MyWorld.cs
View File

@@ -6,7 +6,7 @@ using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
using libsecondlife;
using OpenSim.Region;
using Avatar=OpenSim.Region.Scenes.Avatar;
using Avatar=OpenSim.Region.Scenes.ScenePresence;
using OpenSim.Region.Scenes;
using OpenSim.Framework;
using OpenSim.Caches;
@@ -17,7 +17,7 @@ namespace SimpleApp
public class MyWorld : Scene
{
private RegionInfo m_regionInfo;
private List<OpenSim.Region.Scenes.Avatar> m_avatars;
private List<OpenSim.Region.Scenes.ScenePresence> m_avatars;
public MyWorld(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach)
: base(clientThreads, regionInfo, authen, commsMan, assetCach)
@@ -43,7 +43,8 @@ namespace SimpleApp
#region IWorld Members
override public void AddNewAvatar(IClientAPI client, LLUUID agentID, bool child)
override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child)
{
LLVector3 pos = new LLVector3(128, 128, 128);
@@ -65,7 +66,7 @@ namespace SimpleApp
client.OnCompleteMovementToRegion += delegate()
{
client.SendAvatarData(m_regionInfo, client.FirstName,
client.SendAvatarData(m_regionInfo.RegionHandle, client.FirstName,
client.LastName, client.AgentId, 0,
pos);
@@ -74,7 +75,7 @@ namespace SimpleApp
client.SendRegionHandshake(m_regionInfo);
OpenSim.Region.Scenes.Avatar avatar = new Avatar( client, this, m_regionInfo );
OpenSim.Region.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );
}
@@ -83,7 +84,8 @@ namespace SimpleApp
client.SendWearables( AvatarWearable.DefaultWearables );
}
public void RemoveAvatar(LLUUID agentID)
override public void RemoveClient(LLUUID agentID)
{
}

6
OpenSim/Examples/SimpleApp/Program.cs
View File

@@ -19,13 +19,13 @@ namespace SimpleApp
{
class Program : IAssetReceiver, conscmd_callback
{
private ConsoleBase m_console;
private LogBase m_console;
AuthenticateSessionsBase m_circuitManager;
private void Run()
{
m_console = new ConsoleBase(null, "SimpleApp", this, false);
MainConsole.Instance = m_console;
m_console = new LogBase(null, "SimpleApp", this, false);
MainLog.Instance = m_console;
CheckSumServer checksumServer = new CheckSumServer(12036);
checksumServer.ServerListener();

4
OpenSim/Examples/SimpleApp/SimpleApp.exe.build
View File

@@ -21,13 +21,15 @@
<include name="${project::get-base-directory()}/${build.dir}" />
</lib>
<include name="../../../bin/libsecondlife.dll" />
<include name="../../../bin/OpenGrid.Framework.Communications.dll" />
<include name="../../../bin/OpenSim.Caches.dll" />
<include name="../../../bin/OpenSim.Framework.dll" />
<include name="../../../bin/OpenSim.Framework.Console.dll" />
<include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />
<include name="../../../bin/OpenSim.LocalCommunications.dll" />
<include name="../../../bin/OpenSim.Region.dll" />
<include name="../../../bin/OpenSim.RegionServer.dll" />
<include name="../../../bin/OpenSim.Servers.dll" />
<include name="OpenSim.World.dll" />
<include name="System.dll" />
<include name="System.Data.dll.dll" />
<include name="System.Xml.dll" />