OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* removed try-catchall from scene constructor 

* added reference server-side addnewprim prototype to Scene - not implementet yet though.
Sugilite
lbsa71 2007-07-01 21:16:45 +00:00
parent 2852cda727
commit 2d34caabb9
4 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -102,8 +102,6 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="regionHandle">Region Handle for this region</param>
/// <param name="regionName">Region Name for this region</param>
public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, CommunicationsManager commsMan, AssetCache assetCach, BaseHttpServer httpServer)
{
try
{
updateLock = new Mutex(false);
this.authenticateHandler = authen;
@ -131,12 +129,6 @@ namespace OpenSim.Region.Environment.Scenes
ScenePresence.LoadAnims();
this.httpListener = httpServer;
}
catch (Exception e)
{
OpenSim.Framework.Console.MainLog.Instance.Error("World.cs: Constructor failed with exception " + e.ToString());
}
}
#endregion
@ -440,6 +432,13 @@ namespace OpenSim.Region.Environment.Scenes
}
}
public override uint AddNewPrim(LLUUID ownerId, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID texture, int flags)
{
uint id = NextLocalId;
throw new NotImplementedException("Not implemented yet.");
}
#endregion
#region Add/Remove Avatar Methods
@ -752,5 +751,6 @@ namespace OpenSim.Region.Environment.Scenes
}
#endregion
}
}

2
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@ -150,6 +150,8 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="child"></param>
public abstract void AddNewClient(IClientAPI client, bool child);
public abstract uint AddNewPrim(LLUUID ownerId, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID texture, int flags);
/// <summary>
///
/// </summary>

3
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@ -78,6 +78,9 @@ namespace SimpleApp
pos, null);
client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero );
};
client.SendRegionHandshake(m_regionInfo);

8
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -16,6 +16,7 @@ using OpenSim.Region.Communications.Local;
using OpenSim.Region.ClientStack;
using OpenSim.Region.Physics.BasicPhysicsPlugin;
using System.Net;
using libsecondlife.Packets;
namespace SimpleApp
{
@ -23,6 +24,7 @@ namespace SimpleApp
{
private LogBase m_log;
AuthenticateSessionsBase m_circuitManager;
uint m_localId;
private void Run()
{
@ -65,6 +67,12 @@ namespace SimpleApp
m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
m_log.ReadLine();
PrimData primData = new PrimData();
primData.Scale = new LLVector3(1, 1, 1);
m_localId = world.AddNewPrim( LLUUID.Zero, primData, LLVector3.Zero, new LLQuaternion(0, 0, 0, 0), LLUUID.Zero, 0);
}
private bool AddNewSessionHandler(ulong regionHandle, Login loginData)