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

Merge branch 'master' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2011-12-08 18:29:19 +00:00
parent 8d7c353500 54360dd20e
commit 96539ffc79
13 changed files with 205 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@@ -43,7 +43,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
private readonly UUID m_uuid = UUID.Random();
private readonly Scene m_scene;
public NPCAvatar(string firstname, string lastname, Vector3 position, Scene scene)
{
m_firstname = firstname;
@@ -57,6 +56,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
get { return m_scene; }
}
public ISceneAgent SceneAgent { get { throw new NotImplementedException(); } }
public void Say(string message)
{
SendOnChatFromClient(message, ChatTypeEnum.Say);
@@ -845,6 +846,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
public void Start()
{
// We never start the client, so always fail.
throw new NotImplementedException();
}
public void Stop()