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

Some work on Module loading/management. 

Some more modules templates classes (hoping that someone will pick some of these and work on implementing them).
Early version of the "Dynamic Texture Module", although currently there are no render modules included (so not really functional without them). 
Added osSetDynamicTextureURL script function, for attaching a dynamic texture to a prim. 
Some work on the console command handling. Added "change-region <regionname>" and "exit-region" so that after the use of change-region, the commands entered will apply to that region only. Then use exit-region to return to the top level (so commands then function as they did before and either apply to all regions or to the first region) (Note: this hasn't been tested very much)
afrisby
MW 2007-09-04 13:43:56 +00:00
parent 94b1d3c128
commit bfd36e2e83
28 changed files with 661 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -151,7 +151,7 @@ namespace OpenSim.Framework.Communications.Caches
public void AddAsset(AssetBase asset)
{
// Console.WriteLine("adding asset " + asset.FullID.ToStringHyphenated());
System.Console.WriteLine("adding asset " + asset.FullID.ToStringHyphenated());
if (asset.Type == 0)
{
//Console.WriteLine("which is a texture");
@ -161,6 +161,11 @@ namespace OpenSim.Framework.Communications.Caches
this.Textures.Add(textur.FullID, textur);
this._assetServer.UploadNewAsset(asset);
}
else
{
TextureImage textur = new TextureImage(asset);
this.Textures[asset.FullID] = textur;
}
}
else
{

48
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -45,6 +45,7 @@ using OpenSim.Region.Communications.Local;
using OpenSim.Region.Communications.OGS1;
using OpenSim.Framework.Communications.Caches;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Modules;
using OpenSim.Region.Environment;
using System.Text;
using System.Collections.Generic;
@ -77,11 +78,17 @@ namespace OpenSim
private string m_logFilename = ("region-console.log");
private bool m_permissions = false;
private bool m_DefaultModules = true;
private string m_exceptModules = "";
private bool m_DefaultSharedModules = true;
private string m_exceptSharedModules = "";
private bool standaloneAuthenticate = false;
private string standaloneWelcomeMessage = null;
private string standaloneInventoryPlugin = "";
private string standaloneUserPlugin = "";
private Scene m_consoleRegion = null;
public ConsoleCommand CreateAccount = null;
@ -104,12 +111,10 @@ namespace OpenSim
}
ReadConfigSettings(startupSource);
}
protected void ReadConfigSettings(IConfigSource configSource)
{
m_networkServersInfo = new NetworkServersInfo();
m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false);
m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics");
@ -122,6 +127,11 @@ namespace OpenSim
m_scriptEngine = configSource.Configs["Startup"].GetString("script_engine", "DotNetEngine");
m_DefaultModules = configSource.Configs["Startup"].GetBoolean("default_modules", true);
m_DefaultSharedModules = configSource.Configs["Startup"].GetBoolean("default_shared_modules", true);
m_exceptModules = configSource.Configs["Startup"].GetString("except_modules", "");
m_exceptSharedModules = configSource.Configs["Startup"].GetString("except_shared_modules", "");
standaloneAuthenticate = configSource.Configs["StandAlone"].GetBoolean("accounts_authenticate", false);
standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim");
standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll");
@ -178,6 +188,8 @@ namespace OpenSim
}
m_moduleLoader = new ModuleLoader();
MainLog.Instance.Verbose("Loading Shared Modules");
m_moduleLoader.LoadDefaultSharedModules(m_exceptSharedModules);
// Load all script engines found
OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log);
@ -191,6 +203,10 @@ namespace OpenSim
UDPServer udpServer;
Scene scene = SetupScene(regionInfo, out udpServer);
m_moduleLoader.InitialiseSharedModules(scene);
MainLog.Instance.Verbose("Loading Region's Modules");
m_moduleLoader.CreateDefaultModules(scene, m_exceptModules);
scene.SetModuleInterfaces();
// Check if we have a script engine to load
if (m_scriptEngine != null && m_scriptEngine != "")
@ -211,6 +227,9 @@ namespace OpenSim
m_regionData.Add(regionInfo);
}
m_moduleLoader.PostInitialise();
m_moduleLoader.ClearCache();
// Start UDP servers
for (int i = 0; i < m_udpServers.Count; i++)
{
@ -351,6 +370,8 @@ namespace OpenSim
/// <param name="command">The first argument of the parameter (the command)</param>
/// <param name="cmdparams">Additional arguments passed to the command</param>
public void RunCmd(string command, string[] cmdparams)
{
if ((m_consoleRegion == null) || (command == "exit-region"))
{
switch (command)
{
@ -470,19 +491,36 @@ namespace OpenSim
}
break;
case "set-time":
break;
case "quit":
case "shutdown":
Shutdown();
break;
case "change-region":
foreach (Scene scene in m_localScenes)
{
if (scene.RegionInfo.RegionName.ToLower() == cmdparams[0].ToLower())
{
m_consoleRegion = scene;
}
}
break;
case "exit-region":
m_consoleRegion = null;
break;
default:
m_log.Error("Unknown command");
break;
}
}
else
{
//let the scene/region handle the command directly.
m_consoleRegion.ProcessConsoleCmd(command, cmdparams);
}
}
/// <summary>
/// Outputs to the console information about the region

26
OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs Normal file
View File

@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.IO;
using libsecondlife;
namespace OpenSim.Region.Environment.Interfaces
{
public interface IDynamicTextureManager
{
void RegisterRender(string handleType, IDynamicTextureRender render);
void ReturnData(LLUUID id, byte[] data);
LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, string extraParams, int updateTimer);
}
public interface IDynamicTextureRender
{
string GetName();
string GetContentType();
bool SupportsAsynchronous();
byte[] ConvertUrl(string url, string extraParams);
byte[] ConvertStream(Stream data, string extraParams);
bool AsyncConvertUrl(LLUUID id, string url, string extraParams);
bool AsyncConvertStream(LLUUID id, Stream data, string extraParams);
}
}

1
OpenSim/Region/Environment/Interfaces/IRegionModule.cs
View File

@ -10,5 +10,6 @@ namespace OpenSim.Region.Environment.Interfaces
void PostInitialise();
void CloseDown();
string GetName();
bool IsSharedModule();
}
}

12
OpenSim/Region/Environment/Interfaces/ISimChat.cs Normal file
View File

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
namespace OpenSim.Region.Environment.Interfaces
{
public interface ISimChat
{
void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
}
}

74
OpenSim/Region/Environment/ModuleLoader.cs
View File

@ -14,37 +14,51 @@ namespace OpenSim.Region.Environment
public Dictionary<string, Assembly> LoadedAssemblys = new Dictionary<string, Assembly>();
public List<IRegionModule> LoadedModules = new List<IRegionModule>();
public Dictionary<string, IRegionModule> LoadedSharedModules = new Dictionary<string, IRegionModule>();
public ModuleLoader()
{
}
/// <summary>
/// Really just a test method for loading a set of currently internal modules
/// Should have a module factory?
/// </summary>
/// <param name="scene"></param>
public void CreateDefaultModules(Scene scene)
public void CreateDefaultModules(Scene scene, string exceptModules)
{
//Testing IRegionModule ideas
XferModule xferManager = new XferModule();
xferManager.Initialise(scene);
scene.AddModule(xferManager.GetName(), xferManager);
LoadedModules.Add(xferManager);
ChatModule chatModule = new ChatModule();
chatModule.Initialise(scene);
scene.AddModule(chatModule.GetName(), chatModule);
LoadedModules.Add(chatModule);
AvatarProfilesModule avatarProfiles = new AvatarProfilesModule();
avatarProfiles.Initialise(scene);
scene.AddModule(avatarProfiles.GetName(), avatarProfiles);
LoadedModules.Add(avatarProfiles);
this.LoadModule("OpenSim.Region.ExtensionsScriptModule.dll", "ExtensionsScriptingModule", scene);
this.LoadRegionModule("OpenSim.Region.ExtensionsScriptModule.dll", "ExtensionsScriptingModule", scene);
}
// Post Initialise Modules, which most likely shouldn't be here
// but should rather be in a separate method that is called after all modules are loaded/created/intialised
xferManager.PostInitialise();
// chatModule.PostInitialise(); //for now leave this disabled as it would start up a partially working irc bot
avatarProfiles.PostInitialise();
public void LoadDefaultSharedModules(string exceptModules)
{
DynamicTextureModule dynamicModule = new DynamicTextureModule();
this.LoadedSharedModules.Add(dynamicModule.GetName(), dynamicModule);
}
public void InitialiseSharedModules(Scene scene)
{
foreach (IRegionModule module in this.LoadedSharedModules.Values)
{
module.Initialise(scene);
scene.AddModule(module.GetName(), module); //should be doing this?
}
}
/// <summary>
@ -53,18 +67,33 @@ namespace OpenSim.Region.Environment
/// <param name="dllName"></param>
/// <param name="moduleName"></param>
/// <param name="scene"></param>
public void LoadSharedModule(string dllName, string moduleName, Scene scene)
public void LoadSharedModule(string dllName, string moduleName)
{
IRegionModule module = this.LoadModule(dllName, moduleName);
if (module != null)
{
this.LoadedSharedModules.Add(module.GetName(), module);
}
}
public void LoadRegionModule(string dllName, string moduleName, Scene scene)
{
IRegionModule module = this.LoadModule(dllName, moduleName);
if (module != null)
{
module.Initialise(scene);
scene.AddModule(module.GetName(), module);
LoadedModules.Add(module);
}
}
/// <summary>
/// Loads a external Module (if not already loaded) and creates a new instance of it for the passed Scene.
/// Loads a external Module (if not already loaded) and creates a new instance of it.
/// </summary>
/// <param name="dllName"></param>
/// <param name="moduleName"></param>
/// <param name="scene"></param>
public void LoadModule(string dllName, string moduleName, Scene scene)
public IRegionModule LoadModule(string dllName, string moduleName)
{
Assembly pluginAssembly = null;
if (LoadedAssemblys.ContainsKey(dllName))
@ -97,13 +126,26 @@ namespace OpenSim.Region.Environment
}
pluginAssembly = null;
if (module.GetName() == moduleName)
if ((module != null ) || (module.GetName() == moduleName))
{
module.Initialise(scene);
scene.AddModule(moduleName, module);
module.PostInitialise(); //shouldn't be done here
return module;
}
return null;
}
public void PostInitialise()
{
foreach (IRegionModule module in this.LoadedSharedModules.Values)
{
module.PostInitialise();
}
foreach (IRegionModule module in this.LoadedModules)
{
module.PostInitialise();
}
}
public void ClearCache()

5
OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
View File

@ -38,6 +38,11 @@ namespace OpenSim.Region.Environment.Modules
return "AssetDownloadModule";
}
public bool IsSharedModule()
{
return false;
}
public void NewClient(IClientAPI client)
{
}

10
OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
View File

@ -39,11 +39,21 @@ namespace OpenSim.Region.Environment.Modules
return "AvatarProfilesModule";
}
public bool IsSharedModule()
{
return false;
}
public void NewClient(IClientAPI client)
{
client.OnRequestAvatarProperties += RequestAvatarProperty;
}
public void RemoveClient(IClientAPI client)
{
client.OnRequestAvatarProperties -= RequestAvatarProperty;
}
/// <summary>
///
/// </summary>

11
OpenSim/Region/Environment/Modules/ChatModule.cs
View File

@ -14,7 +14,7 @@ using OpenSim.Framework.Console;
namespace OpenSim.Region.Environment.Modules
{
public class ChatModule : IRegionModule
public class ChatModule : IRegionModule, ISimChat
{
private Scene m_scene;
@ -45,11 +45,12 @@ namespace OpenSim.Region.Environment.Modules
m_scene = scene;
m_scene.EventManager.OnNewClient += NewClient;
//should register a optional API Method, so other modules can send chat messages using this module
m_scene.RegisterModuleInterface<ISimChat>(this);
}
public void PostInitialise()
{
/*
try
{
m_irc = new TcpClient(m_server, m_port);
@ -75,6 +76,7 @@ namespace OpenSim.Region.Environment.Modules
{
Console.WriteLine(e.ToString());
}
*/
}
public void CloseDown()
@ -89,6 +91,11 @@ namespace OpenSim.Region.Environment.Modules
return "ChatModule";
}
public bool IsSharedModule()
{
return false;
}
public void NewClient(IClientAPI client)
{
client.OnChatFromViewer += SimChat;

136
OpenSim/Region/Environment/Modules/DynamicTextureModule.cs Normal file
View File

@ -0,0 +1,136 @@
using System.Text;
using System.Net;
using System.Net.Sockets;
using System.Threading;
using System.IO;
using System.Collections.Generic;
using libsecondlife;
using OpenJPEGNet;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Console;
using OpenSim.Framework.Types;
namespace OpenSim.Region.Environment.Modules
{
public class DynamicTextureModule :IRegionModule, IDynamicTextureManager
{
private Dictionary<LLUUID, Scene> RegisteredScenes = new Dictionary<LLUUID, Scene>();
private Dictionary<string, IDynamicTextureRender> RenderPlugins= new Dictionary<string, IDynamicTextureRender>();
private Dictionary<LLUUID, DynamicTextureUpdater> Updaters = new Dictionary<LLUUID, DynamicTextureUpdater>();
public void Initialise(Scene scene)
{
if (!RegisteredScenes.ContainsKey(scene.RegionInfo.SimUUID))
{
RegisteredScenes.Add(scene.RegionInfo.SimUUID, scene);
scene.RegisterModuleInterface<IDynamicTextureManager>(this);
}
}
public void PostInitialise()
{
}
public void CloseDown()
{
}
public string GetName()
{
return "DynamicTextureModule";
}
public bool IsSharedModule()
{
return true;
}
public void RegisterRender(string handleType, IDynamicTextureRender render)
{
if (!RenderPlugins.ContainsKey(handleType))
{
RenderPlugins.Add(handleType, render);
}
}
public void ReturnData(LLUUID id, byte[] data)
{
if (Updaters.ContainsKey(id))
{
DynamicTextureUpdater updater = Updaters[id];
if (RegisteredScenes.ContainsKey(updater.SimUUID))
{
Scene scene = RegisteredScenes[updater.SimUUID];
updater.DataReceived(data, scene);
}
}
}
public LLUUID AddDynamicTextureURL(LLUUID simID, LLUUID primID, string contentType, string url, string extraParams, int updateTimer)
{
System.Console.WriteLine("dynamic texture being created " + url + " of type " + contentType);
if (this.RenderPlugins.ContainsKey(contentType))
{
DynamicTextureUpdater updater = new DynamicTextureUpdater();
updater.SimUUID = simID;
updater.PrimID = primID;
updater.ContentType = contentType;
updater.Url = url;
updater.UpdateTimer = updateTimer;
updater.UpdaterID = LLUUID.Random();
updater.Params = extraParams;
if (!this.Updaters.ContainsKey(updater.UpdaterID))
{
Updaters.Add(updater.UpdaterID, updater);
}
RenderPlugins[contentType].AsyncConvertUrl(updater.UpdaterID, url, extraParams);
return updater.UpdaterID;
}
return LLUUID.Zero;
}
public class DynamicTextureUpdater
{
public LLUUID SimUUID;
public LLUUID UpdaterID;
public string ContentType;
public string Url;
public Stream StreamData;
public LLUUID PrimID;
public int UpdateTimer;
public LLUUID LastAssetID;
public string Params;
public DynamicTextureUpdater()
{
LastAssetID = LLUUID.Zero;
UpdateTimer = 0;
StreamData = null;
}
public void DataReceived(byte[] data, Scene scene)
{
//TODO delete the last asset(data), if it was a dynamic texture
AssetBase asset = new AssetBase();
asset.FullID = LLUUID.Random();
asset.Data = data;
asset.Name = "DynamicImage" + Util.RandomClass.Next(1, 10000);
asset.Type = 0;
scene.commsManager.AssetCache.AddAsset(asset);
this.LastAssetID = asset.FullID;
SceneObjectPart part = scene.GetSceneObjectPart(PrimID);
part.Shape.TextureEntry = new LLObject.TextureEntry(asset.FullID).ToBytes();
part.ScheduleFullUpdate();
}
}
}
}

10
OpenSim/Region/Environment/Modules/EmailModule.cs Normal file
View File

@ -0,0 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Region.Environment.Modules
{
class EmailModule
{
}
}

5
OpenSim/Region/Environment/Modules/FriendsModule.cs
View File

@ -31,5 +31,10 @@ namespace OpenSim.Region.Environment.Modules
{
return "FriendsModule";
}
public bool IsSharedModule()
{
return false;
}
}
}

5
OpenSim/Region/Environment/Modules/GroupsModule.cs
View File

@ -30,6 +30,11 @@ namespace OpenSim.Region.Environment.Modules
{
return "GroupsModule";
}
public bool IsSharedModule()
{
return false;
}
}
}

5
OpenSim/Region/Environment/Modules/InstantMessageModule.cs
View File

@ -31,5 +31,10 @@ namespace OpenSim.Region.Environment.Modules
{
return "InstantMessageModule";
}
public bool IsSharedModule()
{
return false;
}
}
}

5
OpenSim/Region/Environment/Modules/InventoryModule.cs
View File

@ -31,5 +31,10 @@ namespace OpenSim.Region.Environment.Modules
{
return "InventoryModule";
}
public bool IsSharedModule()
{
return false;
}
}
}

10
OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs Normal file
View File

@ -0,0 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Region.Environment.Modules
{
class ScriptsHttpRequests
{
}
}

10
OpenSim/Region/Environment/Modules/TeleportModule.cs Normal file
View File

@ -0,0 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Region.Environment.Modules
{
class TeleportModule
{
}
}

5
OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
View File

@ -37,6 +37,11 @@ namespace OpenSim.Region.Environment.Modules
return "TextureDownloadModule";
}
public bool IsSharedModule()
{
return false;
}
public void NewClient(IClientAPI client)
{
}

5
OpenSim/Region/Environment/Modules/XferModule.cs
View File

@ -45,6 +45,11 @@ namespace OpenSim.Region.Environment.Modules
return "XferModule";
}
public bool IsSharedModule()
{
return false;
}
public void NewClient(IClientAPI client)
{
client.OnRequestXfer += RequestXfer;

53
OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
View File

@ -35,6 +35,7 @@ using OpenSim.Framework.Types;
using OpenSim.Framework.Communications.Caches;
using OpenSim.Framework.Data;
using OpenSim.Framework.Utilities;
using OpenSim.Region.Environment.Interfaces;
namespace OpenSim.Region.Environment.Scenes
{
@ -94,7 +95,7 @@ namespace OpenSim.Region.Environment.Scenes
}
/// <summary>
/// Should be removed soon as the Chat modules should take over this function
///
/// </summary>
/// <param name="message"></param>
/// <param name="type"></param>
@ -103,56 +104,10 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="fromAgentID"></param>
public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
{
ScenePresence avatar = null;
if (this.Avatars.ContainsKey(fromAgentID))
if (m_simChatModule != null)
{
avatar = this.Avatars[fromAgentID];
fromPos = avatar.AbsolutePosition;
fromName = avatar.Firstname + " " + avatar.Lastname;
avatar = null;
m_simChatModule.SimChat(message, type, fromPos, fromName, fromAgentID);
}
this.ForEachScenePresence(delegate(ScenePresence presence)
{
int dis = -1000;
if (this.Avatars.ContainsKey(presence.ControllingClient.AgentId))
{
avatar = this.Avatars[presence.ControllingClient.AgentId];
dis = (int)avatar.AbsolutePosition.GetDistanceTo(fromPos);
}
switch (type)
{
case 0: // Whisper
if ((dis < 10) && (dis > -10))
{
//should change so the message is sent through the avatar rather than direct to the ClientView
presence.ControllingClient.SendChatMessage(message, type, fromPos, fromName,
fromAgentID);
}
break;
case 1: // Say
if ((dis < 30) && (dis > -30))
{
//Console.WriteLine("sending chat");
presence.ControllingClient.SendChatMessage(message, type, fromPos, fromName,
fromAgentID);
}
break;
case 2: // Shout
if ((dis < 100) && (dis > -100))
{
presence.ControllingClient.SendChatMessage(message, type, fromPos, fromName,
fromAgentID);
}
break;
case 0xff: // Broadcast
presence.ControllingClient.SendChatMessage(message, type, fromPos, fromName,
fromAgentID);
break;
}
});
}
/// <summary>

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

@ -78,19 +78,22 @@ namespace OpenSim.Region.Environment.Scenes
protected StorageManager storageManager;
protected AgentCircuitManager authenticateHandler;
protected RegionCommsListener regionCommsHost;
protected CommunicationsManager commsManager;
public CommunicationsManager commsManager;
// protected XferManager xferManager;
protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
protected BaseHttpServer httpListener;
protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>();
protected Dictionary<string, object> APIMethods = new Dictionary<string, object>();
public Dictionary<Type, object> ModuleInterfaces = new Dictionary<Type, object>();
protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();
//API method Delegates
//API method Delegates and interfaces
// this most likely shouldn't be handled as a API method like this, but doing it for testing purposes
public ModuleAPIMethod2<bool, string, byte[]>AddXferFile = null;
public ModuleAPIMethod2<bool, string, byte[]> AddXferFile = null;
private ISimChat m_simChatModule = null;
#region Properties
@ -169,9 +172,6 @@ namespace OpenSim.Region.Environment.Scenes
m_eventManager = new EventManager();
m_permissionManager = new PermissionManager(this);
MainLog.Instance.Verbose("Loading Region Modules");
m_moduleLoader.CreateDefaultModules(this);
m_eventManager.OnParcelPrimCountAdd +=
m_LandManager.addPrimToLandPrimCounts;
@ -189,13 +189,15 @@ namespace OpenSim.Region.Environment.Scenes
httpListener = httpServer;
SetMethodDelegates();
}
#endregion
private void SetMethodDelegates()
public void SetModuleInterfaces()
{
m_simChatModule = this.RequestModuleInterface<ISimChat>();
//should change so it uses the module interface functions
AddXferFile = (ModuleAPIMethod2<bool, string, byte[]>)this.RequestAPIMethod("API_AddXferFile");
}
@ -1077,7 +1079,6 @@ namespace OpenSim.Region.Environment.Scenes
commsManager.InterRegion.InformRegionOfChildAgent(regionHandle, agent);
commsManager.InterRegion.ExpectAvatarCrossing(regionHandle, remoteClient.AgentId, position, false);
//TODO: following line is hard coded to port 9000, really need to change this as soon as possible
AgentCircuitData circuitdata = remoteClient.RequestClientInfo();
string capsPath = Util.GetCapsURL(remoteClient.AgentId);
remoteClient.SendRegionTeleport(regionHandle, 13, reg.ExternalEndPoint, 4, (1 << 4), capsPath);
@ -1114,23 +1115,45 @@ namespace OpenSim.Region.Environment.Scenes
}
}
//following delegate methods will be removed, so use the interface methods (below these)
public void RegisterAPIMethod(string name, object method)
{
if (!this.APIMethods.ContainsKey(name))
if (!this.ModuleAPIMethods.ContainsKey(name))
{
this.APIMethods.Add(name, method);
this.ModuleAPIMethods.Add(name, method);
}
}
public object RequestAPIMethod(string name)
{
if (this.APIMethods.ContainsKey(name))
if (this.ModuleAPIMethods.ContainsKey(name))
{
return APIMethods[name];
return ModuleAPIMethods[name];
}
return false;
}
public void RegisterModuleInterface<M>( M mod)
{
//Console.WriteLine("registering module interface " + typeof(M));
if (!this.ModuleInterfaces.ContainsKey(typeof(M)))
{
ModuleInterfaces.Add(typeof(M), mod);
}
}
public T RequestModuleInterface<T>()
{
if (ModuleInterfaces.ContainsKey(typeof(T)))
{
return (T)ModuleInterfaces[typeof(T)];
}
else
{
return default(T);
}
}
public void SetTimePhase(int phase)
{
m_timePhase = phase;
@ -1205,6 +1228,49 @@ namespace OpenSim.Region.Environment.Scenes
}
#endregion
public void ProcessConsoleCmd(string command, string[] cmdparams)
{
switch (command)
{
case "save-xml":
if (cmdparams.Length > 0)
{
SavePrimsToXml(cmdparams[0]);
}
else
{
SavePrimsToXml("test.xml");
}
break;
case "load-xml":
if (cmdparams.Length > 0)
{
LoadPrimsFromXml(cmdparams[0]);
}
else
{
LoadPrimsFromXml("test.xml");
}
break;
case "set-time":
break;
case "backup":
Backup();
break;
case "alert":
HandleAlertCommand(cmdparams);
break;
default:
MainLog.Instance.Error("Unknown command: " + command);
break;
}
}
#region Script Engine
private List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface> ScriptEngines = new List<OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface>();
public void AddScriptEngine(OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine, LogBase m_logger)
@ -1248,5 +1314,22 @@ namespace OpenSim.Region.Environment.Scenes
}
return null;
}
public SceneObjectPart GetSceneObjectPart(LLUUID fullID)
{
bool hasPrim = false;
foreach (EntityBase ent in Entities.Values)
{
if (ent is SceneObjectGroup)
{
hasPrim = ((SceneObjectGroup)ent).HasChildPrim(fullID);
if (hasPrim != false)
{
return ((SceneObjectGroup)ent).GetChildPart(fullID);
}
}
}
return null;
}
}
}

9
OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
View File

@ -98,12 +98,14 @@ namespace SimpleApp
private LLUUID myID = LLUUID.Random();
public MyNpcCharacter( EventManager eventManager )
{
// startPos = new LLVector3(128, (float)(Util.RandomClass.NextDouble()*100), 2);
eventManager.OnFrame += Update;
}
private LLVector3 startPos = new LLVector3(128, 128,2);
public virtual LLVector3 StartPos
{
get { return new LLVector3(128, 100, 2); }
get { return startPos; }
set { }
}
@ -122,9 +124,10 @@ namespace SimpleApp
get { return "Annoying"; }
}
private string lastName = "NPC" + Util.RandomClass.Next(1, 1000);
public virtual string LastName
{
get { return "NPC"; }
get { return lastName; }
}
public virtual void OutPacket(Packet newPack) { }
@ -203,7 +206,7 @@ namespace SimpleApp
flyState = 0;
}
if (count >= 40)
if (count >= 200)
{
if (OnChatFromViewer != null)
{

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

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Net;
using libsecondlife;
using OpenSim.Framework;
@ -22,6 +23,7 @@ namespace SimpleApp
{
class Program : RegionApplicationBase, conscmd_callback
{
private ModuleLoader m_moduleLoader;
protected override LogBase CreateLog()
{
return new LogBase(null, "SimpleApp", this, false);
@ -59,9 +61,20 @@ namespace SimpleApp
UDPServer udpServer;
m_moduleLoader = new ModuleLoader();
m_moduleLoader.LoadDefaultSharedModules("");
Scene scene = SetupScene(regionInfo, out udpServer);
m_moduleLoader.InitialiseSharedModules(scene);
m_moduleLoader.CreateDefaultModules(scene, "");
scene.SetModuleInterfaces();
scene.StartTimer();
m_moduleLoader.PostInitialise();
m_moduleLoader.ClearCache();
udpServer.ServerListener();
LLVector3 pos = new LLVector3(110, 129, 27);
@ -76,8 +89,19 @@ namespace SimpleApp
scene.AddEntity(complexObject);
}
/*for (int i = 0; i < 500; i++)
{
MyNpcCharacter m_character = new MyNpcCharacter(scene.EventManager);
scene.AddNewClient(m_character, false);
}
List<ScenePresence> avatars = scene.RequestAvatarList();
foreach (ScenePresence avatar in avatars)
{
avatar.AbsolutePosition = new LLVector3((float)OpenSim.Framework.Utilities.Util.RandomClass.Next(100,200), (float)OpenSim.Framework.Utilities.Util.RandomClass.Next(30, 200), 2);
}*/
DirectoryInfo dirInfo = new DirectoryInfo( "." );

9
OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
{
// Default Engines
CSharpScriptEngine csharpCompiler = new CSharpScriptEngine();
compilers.Add(csharpCompiler.FileExt(),csharpCompiler);
compilers.Add(csharpCompiler.FileExt(), csharpCompiler);
JScriptEngine jscriptCompiler = new JScriptEngine();
compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);
@ -91,6 +91,11 @@ namespace OpenSim.Region.ExtensionsScriptModule
return "ExtensionsScriptingModule";
}
public bool IsSharedModule()
{
return false;
}
public bool Compile(string filename)
{
foreach (KeyValuePair<string, IScriptCompiler> compiler in compilers)
@ -132,7 +137,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
interface IScriptCompiler
{
Dictionary<string,IScript> compile(string filename);
Dictionary<string, IScript> compile(string filename);
string FileExt();
}
}

3
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
View File

@ -628,5 +628,8 @@ namespace OpenSim.Region.ScriptEngine.Common
int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide);
//wiki list llGetParcelDetails(vector pos, list params)
List<string> llGetParcelDetails(LSL_Types.Vector3 pos, List<string> param);
//OpenSim functions
string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer);
}
}

3
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
View File

@ -26,9 +26,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
}
public string Convert(string Script)
{
string Return = "";

6
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
View File

@ -465,8 +465,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide) { return m_LSL_Functions.llGetParcelMaxPrims(pos, sim_wide); }
public List<string> llGetParcelDetails(LSL_Types.Vector3 pos, List<string> param) { return m_LSL_Functions.llGetParcelDetails(pos, param); }
//
// OpenSim Functions
//
public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer) { return m_LSL_Functions.osSetDynamicTextureURL(dynamicID, contentType, url, extraParams, timer); }
// LSL CONSTANTS
public const int TRUE = 1;

19
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
View File

@ -4,6 +4,7 @@ using System.Text;
using libsecondlife;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Scenes.Scripting;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler;
using OpenSim.Region.ScriptEngine.Common;
using OpenSim.Framework.Console;
@ -650,6 +651,24 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
public int llGetParcelMaxPrims(LSL_Types.Vector3 pos, int sim_wide) { return 0; }
public List<string> llGetParcelDetails(LSL_Types.Vector3 pos, List<string> param) { return new List<string>(); }
//
// OpenSim functions
//
public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer)
{
if (dynamicID == "")
{
IDynamicTextureManager textureManager = this.World.RequestModuleInterface<IDynamicTextureManager>();
LLUUID createdTexture = textureManager.AddDynamicTextureURL(World.RegionInfo.SimUUID, this.m_host.UUID, contentType, url, extraParams, timer);
return createdTexture.ToStringHyphenated();
}
else
{
//TODO update existing dynamic textures
}
return LLUUID.Zero.ToStringHyphenated();
}
}
}