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

* This is the fabled LibOMV update with all of the libOMV types from JHurliman

Browse Source 
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point.  Regular people should let the dust settle.
* This has been tested to work with most basic functions. However..   make sure you back up 'everything' before using this.  It's that big!  
* Essentially we're back at square 1 in the testing phase..  so lets identify things that broke.
This commit is contained in:
Teravus Ovares
2008-09-06 07:52:41 +00:00
parent cbec2bf22b
commit 7d89e12293
388 changed files with 6811 additions and 7138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
View File

@@ -28,7 +28,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
using OpenSim.Region.Interfaces;
@@ -36,7 +36,6 @@ using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Interfaces;
using Axiom.Math;
namespace OpenSim.Region.ScriptEngine.XEngine
{
@@ -68,7 +67,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
}
private void HandleObjectPaid(LLUUID objectID, LLUUID agentID,
private void HandleObjectPaid(UUID objectID, UUID agentID,
int amount)
{
SceneObjectPart part =
@@ -80,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
}
public void touch_start(uint localID, uint originalID, LLVector3 offsetPos,
public void touch_start(uint localID, uint originalID, Vector3 offsetPos,
IClientAPI remoteClient)
{
// Add to queue for all scripts in ObjectID object
@@ -108,7 +107,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
det));
}
public void touch(uint localID, uint originalID, LLVector3 offsetPos,
public void touch(uint localID, uint originalID, Vector3 offsetPos,
IClientAPI remoteClient)
{
// Add to queue for all scripts in ObjectID object
@@ -177,7 +176,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// state_entry: not processed here
// state_exit: not processed here
public void money(uint localID, LLUUID agentID, int amount)
public void money(uint localID, UUID agentID, int amount)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"money", new object[] {
@@ -242,7 +241,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
det.ToArray()));
}
public void land_collision_start(uint localID, LLUUID itemID)
public void land_collision_start(uint localID, UUID itemID)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"land_collision_start",
@@ -250,7 +249,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
new DetectParams[0]));
}
public void land_collision(uint localID, LLUUID itemID)
public void land_collision(uint localID, UUID itemID)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"land_collision",
@@ -258,7 +257,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
new DetectParams[0]));
}
public void land_collision_end(uint localID, LLUUID itemID)
public void land_collision_end(uint localID, UUID itemID)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"land_collision_end",
@@ -269,7 +268,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// timer: not handled here
// listen: not handled here
public void control(uint localID, LLUUID itemID, LLUUID agentID, uint held, uint change)
public void control(uint localID, UUID itemID, UUID agentID, uint held, uint change)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"control",new object[] {
@@ -279,7 +278,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
new DetectParams[0]));
}
public void email(uint localID, LLUUID itemID, string timeSent,
public void email(uint localID, UUID itemID, string timeSent,
string address, string subject, string message, int numLeft)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
@@ -292,8 +291,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
new DetectParams[0]));
}
public void at_target(uint localID, uint handle, LLVector3 targetpos,
LLVector3 atpos)
public void at_target(uint localID, uint handle, Vector3 targetpos,
Vector3 atpos)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"at_target", new object[] {
@@ -310,14 +309,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
new DetectParams[0]));
}
public void at_rot_target(uint localID, LLUUID itemID)
public void at_rot_target(uint localID, UUID itemID)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"at_rot_target",new object[0],
new DetectParams[0]));
}
public void not_at_rot_target(uint localID, LLUUID itemID)
public void not_at_rot_target(uint localID, UUID itemID)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"not_at_rot_target",new object[0],
@@ -326,7 +325,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// run_time_permissions: not handled here
public void attach(uint localID, LLUUID itemID, LLUUID avatar)
public void attach(uint localID, UUID itemID, UUID avatar)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"attach",new object[] {
@@ -337,14 +336,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// dataserver: not handled here
// link_message: not handled here
public void moving_start(uint localID, LLUUID itemID)
public void moving_start(uint localID, UUID itemID)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"moving_start",new object[0],
new DetectParams[0]));
}
public void moving_end(uint localID, LLUUID itemID)
public void moving_end(uint localID, UUID itemID)
{
myScriptEngine.PostObjectEvent(localID, new EventParams(
"moving_end",new object[0],

86
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@@ -34,7 +34,7 @@ using System.Security.Policy;
using System.Reflection;
using System.Globalization;
using System.Xml;
using libsecondlife;
using OpenMetaverse;
using log4net;
using Nini.Config;
using Amib.Threading;
@@ -76,28 +76,28 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// Maps the local id to the script inventory items in it
private Dictionary<uint, List<LLUUID> > m_PrimObjects =
new Dictionary<uint, List<LLUUID> >();
private Dictionary<uint, List<UUID> > m_PrimObjects =
new Dictionary<uint, List<UUID> >();
// Maps the LLUUID above to the script instance
// Maps the UUID above to the script instance
private Dictionary<LLUUID, IScriptInstance> m_Scripts =
new Dictionary<LLUUID, IScriptInstance>();
private Dictionary<UUID, IScriptInstance> m_Scripts =
new Dictionary<UUID, IScriptInstance>();
// Maps the asset ID to the assembly
private Dictionary<LLUUID, string> m_Assemblies =
new Dictionary<LLUUID, string>();
private Dictionary<UUID, string> m_Assemblies =
new Dictionary<UUID, string>();
// This will list AppDomains by script asset
private Dictionary<LLUUID, AppDomain> m_AppDomains =
new Dictionary<LLUUID, AppDomain>();
private Dictionary<UUID, AppDomain> m_AppDomains =
new Dictionary<UUID, AppDomain>();
// List the scripts running in each appdomain
private Dictionary<LLUUID, List<LLUUID> > m_DomainScripts =
new Dictionary<LLUUID, List<LLUUID> >();
private Dictionary<UUID, List<UUID> > m_DomainScripts =
new Dictionary<UUID, List<UUID> >();
private Queue m_CompileQueue = new Queue(100);
IWorkItemResult m_CurrentCompile = null;
@@ -125,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// private struct RezScriptParms
// {
// uint LocalID;
// LLUUID ItemID;
// UUID ItemID;
// string Script;
// }
@@ -314,7 +314,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
get { return false; }
}
public void OnRezScript(uint localID, LLUUID itemID, string script, int startParam, bool postOnRez)
public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez)
{
Object[] parms = new Object[]{localID, itemID, script, startParam, postOnRez};
@@ -395,7 +395,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
{
Object[] p = (Object[])parm;
uint localID = (uint)p[0];
LLUUID itemID = (LLUUID)p[1];
UUID itemID = (UUID)p[1];
string script =(string)p[2];
int startParam = (int)p[3];
bool postOnRez = (bool)p[4];
@@ -411,7 +411,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (item == null)
return false;
LLUUID assetID = item.AssetID;
UUID assetID = item.AssetID;
// m_log.DebugFormat("[XEngine] Compiling script {0} ({1})",
// item.Name, itemID.ToString());
@@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
string text = "Error compiling script:\r\n" + e.Message.ToString();
if (text.Length > 1000)
text = text.Substring(0, 1000);
World.SimChat(Helpers.StringToField(text),
World.SimChat(Utils.StringToBytes(text),
ChatTypeEnum.DebugChannel, 2147483647,
part.AbsolutePosition,
part.Name, part.UUID, false);
@@ -455,7 +455,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if ((!m_Scripts.ContainsKey(itemID)) ||
(m_Scripts[itemID].AssetID != assetID))
{
LLUUID appDomain = assetID;
UUID appDomain = assetID;
if (part.ParentGroup.RootPart.IsAttachment)
appDomain = part.ParentGroup.RootPart.UUID;
@@ -480,7 +480,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
m_AppDomains[appDomain].AssemblyResolve +=
new ResolveEventHandler(
AssemblyResolver.OnAssemblyResolve);
m_DomainScripts[appDomain] = new List<LLUUID>();
m_DomainScripts[appDomain] = new List<UUID>();
}
catch (Exception e)
{
@@ -507,7 +507,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
if (!m_PrimObjects.ContainsKey(localID))
m_PrimObjects[localID] = new List<LLUUID>();
m_PrimObjects[localID] = new List<UUID>();
if (!m_PrimObjects[localID].Contains(itemID))
m_PrimObjects[localID].Add(itemID);
@@ -518,7 +518,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return true;
}
public void OnRemoveScript(uint localID, LLUUID itemID)
public void OnRemoveScript(uint localID, UUID itemID)
{
lock (m_Scripts)
{
@@ -569,24 +569,24 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
}
public void OnScriptReset(uint localID, LLUUID itemID)
public void OnScriptReset(uint localID, UUID itemID)
{
ResetScript(itemID);
}
public void OnStartScript(uint localID, LLUUID itemID)
public void OnStartScript(uint localID, UUID itemID)
{
StartScript(itemID);
}
public void OnStopScript(uint localID, LLUUID itemID)
public void OnStopScript(uint localID, UUID itemID)
{
StopScript(itemID);
}
private void CleanAssemblies()
{
List<LLUUID> assetIDList = new List<LLUUID>(m_Assemblies.Keys);
List<UUID> assetIDList = new List<UUID>(m_Assemblies.Keys);
foreach (IScriptInstance i in m_Scripts.Values)
{
@@ -594,7 +594,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
assetIDList.Remove(i.AssetID);
}
foreach (LLUUID assetID in assetIDList)
foreach (UUID assetID in assetIDList)
{
// m_log.DebugFormat("[XEngine] Removing unreferenced assembly {0}", m_Assemblies[assetID]);
try
@@ -615,7 +615,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
}
private void UnloadAppDomain(LLUUID id)
private void UnloadAppDomain(UUID id)
{
if (m_AppDomains.ContainsKey(id))
{
@@ -681,7 +681,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (!m_PrimObjects.ContainsKey(localID))
return false;
foreach (LLUUID itemID in m_PrimObjects[localID])
foreach (UUID itemID in m_PrimObjects[localID])
{
if (m_Scripts.ContainsKey(itemID))
{
@@ -699,7 +699,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
//
// Post an event to a single script
//
public bool PostScriptEvent(LLUUID itemID, EventParams p)
public bool PostScriptEvent(UUID itemID, EventParams p)
{
if (m_Scripts.ContainsKey(itemID))
{
@@ -737,7 +737,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return null;
}
private IScriptInstance GetInstance(LLUUID itemID)
private IScriptInstance GetInstance(UUID itemID)
{
IScriptInstance instance;
lock (m_Scripts)
@@ -749,7 +749,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return instance;
}
public void SetScriptState(LLUUID itemID, bool running)
public void SetScriptState(UUID itemID, bool running)
{
IScriptInstance instance = GetInstance(itemID);
if (instance != null)
@@ -761,7 +761,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
}
}
public bool GetScriptState(LLUUID itemID)
public bool GetScriptState(UUID itemID)
{
IScriptInstance instance = GetInstance(itemID);
if (instance != null)
@@ -769,35 +769,35 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return false;
}
public void ApiResetScript(LLUUID itemID)
public void ApiResetScript(UUID itemID)
{
IScriptInstance instance = GetInstance(itemID);
if (instance != null)
instance.ApiResetScript();
}
public void ResetScript(LLUUID itemID)
public void ResetScript(UUID itemID)
{
IScriptInstance instance = GetInstance(itemID);
if (instance != null)
instance.ResetScript();
}
public void StartScript(LLUUID itemID)
public void StartScript(UUID itemID)
{
IScriptInstance instance = GetInstance(itemID);
if (instance != null)
instance.Start();
}
public void StopScript(LLUUID itemID)
public void StopScript(UUID itemID)
{
IScriptInstance instance = GetInstance(itemID);
if (instance != null)
instance.Stop(0);
}
public DetectParams GetDetectParams(LLUUID itemID, int idx)
public DetectParams GetDetectParams(UUID itemID, int idx)
{
IScriptInstance instance = GetInstance(itemID);
if (instance != null)
@@ -805,22 +805,22 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return null;
}
public LLUUID GetDetectID(LLUUID itemID, int idx)
public UUID GetDetectID(UUID itemID, int idx)
{
IScriptInstance instance = GetInstance(itemID);
if (instance != null)
return instance.GetDetectID(idx);
return LLUUID.Zero;
return UUID.Zero;
}
public void SetState(LLUUID itemID, string newState)
public void SetState(UUID itemID, string newState)
{
IScriptInstance instance = GetInstance(itemID);
if (instance == null)
return;
instance.SetState(newState);
}
public string GetState(LLUUID itemID)
public string GetState(UUID itemID)
{
IScriptInstance instance = GetInstance(itemID);
if (instance == null)
@@ -828,7 +828,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return instance.State;
}
public int GetStartParameter(LLUUID itemID)
public int GetStartParameter(UUID itemID)
{
IScriptInstance instance = GetInstance(itemID);
if (instance == null)
@@ -836,7 +836,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return instance.StartParam;
}
public bool GetScriptRunning(LLUUID objectID, LLUUID itemID)
public bool GetScriptRunning(UUID objectID, UUID itemID)
{
return GetScriptState(itemID);
}