ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +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

8
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
View File

@@ -29,7 +29,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Threading;
using libsecondlife;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.ScriptEngine.Interfaces;
@@ -192,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// </summary>
/// <param name="localID"></param>
/// <param name="itemID"></param>
public void RemoveScript(uint localID, LLUUID itemID)
public void RemoveScript(uint localID, UUID itemID)
{
// Remove a specific script
@@ -219,7 +219,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
public Object[] GetSerializationData(LLUUID itemID)
public Object[] GetSerializationData(UUID itemID)
{
List<Object> data = new List<Object>();
@@ -250,7 +250,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return data.ToArray();
}
public void CreateFromData(uint localID, LLUUID itemID, LLUUID hostID,
public void CreateFromData(uint localID, UUID itemID, UUID hostID,
Object[] data)
{
int idx = 0;

559
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

File diff suppressed because it is too large Load Diff

31
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -26,8 +26,7 @@
*/
using System;
using System.Runtime.Remoting.Lifetime;
using Axiom.Math;
using libsecondlife;
using OpenMetaverse;
using Nini.Config;
using OpenSim.Framework.Console;
using OpenSim.Region.Environment.Interfaces;
@@ -46,9 +45,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
internal IScriptEngine m_ScriptEngine;
internal SceneObjectPart m_host;
internal uint m_localID;
internal LLUUID m_itemID;
internal UUID m_itemID;
public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, LLUUID itemID)
public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
{
m_ScriptEngine = ScriptEngine;
m_host = host;
@@ -86,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (x > 255 || x < 0 || y > 255 || y < 0)
OSSLError("osTerrainSetHeight: Coordinate out of bounds");
if (World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new LLVector3(x, y, 0)))
if (World.ExternalChecks.ExternalChecksCanTerraformLand(m_host.OwnerID, new Vector3(x, y, 0)))
{
World.Heightmap[x, y] = val;
return 1;
@@ -144,7 +143,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
World.SendGeneralAlert(msg);
}
public void osSetRot(LLUUID target, Quaternion rotation)
public void osSetRot(UUID target, Quaternion rotation)
{
if (!m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false))
{
@@ -176,7 +175,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (dynamicID == String.Empty)
{
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
LLUUID createdTexture =
UUID createdTexture =
textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
extraParams, timer);
return createdTexture.ToString();
@@ -186,7 +185,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
//TODO update existing dynamic textures
}
return LLUUID.Zero.ToString();
return UUID.Zero.ToString();
}
public string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,
@@ -202,7 +201,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (dynamicID == String.Empty)
{
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
LLUUID createdTexture =
UUID createdTexture =
textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
extraParams, timer, true, (byte) alpha);
return createdTexture.ToString();
@@ -212,7 +211,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
//TODO update existing dynamic textures
}
return LLUUID.Zero.ToString();
return UUID.Zero.ToString();
}
public string osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams,
@@ -230,7 +229,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
if (textureManager != null)
{
LLUUID createdTexture =
UUID createdTexture =
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
extraParams, timer);
return createdTexture.ToString();
@@ -241,7 +240,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
//TODO update existing dynamic textures
}
return LLUUID.Zero.ToString();
return UUID.Zero.ToString();
}
public string osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams,
@@ -259,7 +258,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
if (textureManager != null)
{
LLUUID createdTexture =
UUID createdTexture =
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
extraParams, timer, true, (byte) alpha);
return createdTexture.ToString();
@@ -270,7 +269,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
//TODO update existing dynamic textures
}
return LLUUID.Zero.ToString();
return UUID.Zero.ToString();
}
public bool osConsoleCommand(string command)
@@ -539,9 +538,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
m_host.AddScriptLPS(1);
LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
UUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
if (landowner == LLUUID.Zero)
if (landowner == UUID.Zero)
{
return;
}

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs
View File

@@ -28,7 +28,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using OpenMetaverse;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api;
@@ -49,28 +49,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
private class DataserverRequest
{
public uint localID;
public LLUUID itemID;
public UUID itemID;
public LLUUID ID;
public UUID ID;
public string handle;
public DateTime startTime;
}
public LLUUID RegisterRequest(uint localID, LLUUID itemID,
public UUID RegisterRequest(uint localID, UUID itemID,
string identifier)
{
lock (DataserverRequests)
{
if (DataserverRequests.ContainsKey(identifier))
return LLUUID.Zero;
return UUID.Zero;
DataserverRequest ds = new DataserverRequest();
ds.localID = localID;
ds.itemID = itemID;
ds.ID = LLUUID.Random();
ds.ID = UUID.Random();
ds.handle = identifier;
ds.startTime = DateTime.Now;
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
new DetectParams[0]));
}
public void RemoveEvents(uint localID, LLUUID itemID)
public void RemoveEvents(uint localID, UUID itemID)
{
lock (DataserverRequests)
{

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
View File

@@ -26,7 +26,7 @@
*/
using System;
using libsecondlife;
using OpenMetaverse;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
using OpenSim.Region.ScriptEngine.Shared;
@@ -74,14 +74,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
}
}
public Object[] GetSerializationData(LLUUID itemID)
public Object[] GetSerializationData(UUID itemID)
{
IWorldComm comms = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
return comms.GetSerializationData(itemID);
}
public void CreateFromData(uint localID, LLUUID itemID, LLUUID hostID,
public void CreateFromData(uint localID, UUID itemID, UUID hostID,
Object[] data)
{
IWorldComm comms = m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();

50
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
View File

@@ -27,7 +27,7 @@
using System;
using System.Collections.Generic;
using libsecondlife;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment.Scenes;
@@ -45,8 +45,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
m_CmdManager = CmdManager;
}
public Dictionary<uint, Dictionary<LLUUID, LSL_Types.list>> SenseEvents =
new Dictionary<uint, Dictionary<LLUUID, LSL_Types.list>>();
public Dictionary<uint, Dictionary<UUID, LSL_Types.list>> SenseEvents =
new Dictionary<uint, Dictionary<UUID, LSL_Types.list>>();
private Object SenseLock = new Object();
//
@@ -55,12 +55,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
private class SenseRepeatClass
{
public uint localID;
public LLUUID itemID;
public UUID itemID;
public double interval;
public DateTime next;
public string name;
public LLUUID keyID;
public UUID keyID;
public int type;
public double range;
public double arc;
@@ -70,8 +70,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
private List<SenseRepeatClass> SenseRepeaters = new List<SenseRepeatClass>();
private object SenseRepeatListLock = new object();
public void SetSenseRepeatEvent(uint m_localID, LLUUID m_itemID,
string name, LLUUID keyID, int type, double range,
public void SetSenseRepeatEvent(uint m_localID, UUID m_itemID,
string name, UUID keyID, int type, double range,
double arc, double sec, SceneObjectPart host)
{
// Always remove first, in case this is a re-set
@@ -98,7 +98,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
}
}
public void UnSetSenseRepeaterEvents(uint m_localID, LLUUID m_itemID)
public void UnSetSenseRepeaterEvents(uint m_localID, UUID m_itemID)
{
// Remove from timer
lock (SenseRepeatListLock)
@@ -138,8 +138,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
} // lock
}
public void SenseOnce(uint m_localID, LLUUID m_itemID,
string name, LLUUID keyID, int type,
public void SenseOnce(uint m_localID, UUID m_itemID,
string name, UUID keyID, int type,
double range, double arc, SceneObjectPart host)
{
// Add to timer
@@ -156,11 +156,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
SensorSweep(ts);
}
public LSL_Types.list GetSensorList(uint m_localID, LLUUID m_itemID)
public LSL_Types.list GetSensorList(uint m_localID, UUID m_itemID)
{
lock (SenseLock)
{
Dictionary<LLUUID, LSL_Types.list> Obj = null;
Dictionary<UUID, LSL_Types.list> Obj = null;
if (!SenseEvents.TryGetValue(m_localID, out Obj))
{
return null;
@@ -187,11 +187,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
return;
}
LLVector3 sensorPos = SensePoint.AbsolutePosition;
LLVector3 regionPos = new LLVector3(m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocX * Constants.RegionSize, m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocY * Constants.RegionSize, 0);
LLVector3 fromRegionPos = sensorPos + regionPos;
Vector3 sensorPos = SensePoint.AbsolutePosition;
Vector3 regionPos = new Vector3(m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocX * Constants.RegionSize, m_CmdManager.m_ScriptEngine.World.RegionInfo.RegionLocY * Constants.RegionSize, 0);
Vector3 fromRegionPos = sensorPos + regionPos;
LLQuaternion q = SensePoint.RotationOffset;
Quaternion q = SensePoint.RotationOffset;
LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
foreach (EntityBase ent in m_CmdManager.m_ScriptEngine.World.Entities.Values)
{
LLVector3 toRegionPos = ent.AbsolutePosition + regionPos;
Vector3 toRegionPos = ent.AbsolutePosition + regionPos;
double dis = Math.Abs((double)Util.GetDistanceTo(toRegionPos, fromRegionPos));
if (dis <= ts.range)
{
@@ -239,7 +239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
double ang_obj = 0;
try
{
LLVector3 diff = toRegionPos - fromRegionPos;
Vector3 diff = toRegionPos - fromRegionPos;
LSL_Types.Vector3 obj_dir = new LSL_Types.Vector3(diff.X, diff.Y, diff.Z);
double dot = LSL_Types.Vector3.Dot(forward_dir, obj_dir);
double mag_obj = LSL_Types.Vector3.Mag(obj_dir);
@@ -252,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
if (ang_obj > ts.arc) keep = false;
}
if (keep && (ts.keyID != LLUUID.Zero) && (ts.keyID != ent.UUID))
if (keep && (ts.keyID != UUID.Zero) && (ts.keyID != ent.UUID))
{
keep = false;
}
@@ -292,10 +292,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
// Create object if it doesn't exist
if (SenseEvents.ContainsKey(ts.localID) == false)
{
SenseEvents.Add(ts.localID, new Dictionary<LLUUID, LSL_Types.list>());
SenseEvents.Add(ts.localID, new Dictionary<UUID, LSL_Types.list>());
}
// clear if previous traces exist
Dictionary<LLUUID, LSL_Types.list> Obj;
Dictionary<UUID, LSL_Types.list> Obj;
SenseEvents.TryGetValue(ts.localID, out Obj);
if (Obj.ContainsKey(ts.itemID) == true)
Obj.Remove(ts.itemID);
@@ -320,7 +320,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
for (idx = 0; idx < SensedObjects.Length; idx++)
{
detect[idx] = new DetectParams();
detect[idx].Key=(LLUUID)(SensedObjects.Data[idx]);
detect[idx].Key=(UUID)(SensedObjects.Data[idx]);
detect[idx].Populate(m_CmdManager.m_ScriptEngine.World);
}
@@ -333,7 +333,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
}
}
public Object[] GetSerializationData(LLUUID itemID)
public Object[] GetSerializationData(UUID itemID)
{
List<Object> data = new List<Object>();
@@ -352,7 +352,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
return data.ToArray();
}
public void CreateFromData(uint localID, LLUUID itemID, LLUUID objectID,
public void CreateFromData(uint localID, UUID itemID, UUID objectID,
Object[] data)
{
SceneObjectPart part =
@@ -373,7 +373,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
ts.interval = (double)data[idx];
ts.name = (string)data[idx+1];
ts.keyID = (LLUUID)data[idx+2];
ts.keyID = (UUID)data[idx+2];
ts.type = (int)data[idx+3];
ts.range = (double)data[idx+4];
ts.arc = (double)data[idx+5];

12
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
View File

@@ -28,7 +28,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using OpenMetaverse;
using OpenSim.Region.ScriptEngine.Shared.Api;
namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
@@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
private class TimerClass
{
public uint localID;
public LLUUID itemID;
public UUID itemID;
//public double interval;
public long interval;
//public DateTime next;
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
private List<TimerClass> Timers = new List<TimerClass>();
private object TimerListLock = new object();
public void SetTimerEvent(uint m_localID, LLUUID m_itemID, double sec)
public void SetTimerEvent(uint m_localID, UUID m_itemID, double sec)
{
// Always remove first, in case this is a re-set
UnSetTimerEvents(m_localID, m_itemID);
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
}
}
public void UnSetTimerEvents(uint m_localID, LLUUID m_itemID)
public void UnSetTimerEvents(uint m_localID, UUID m_itemID)
{
// Remove from timer
lock (TimerListLock)
@@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
}
}
public Object[] GetSerializationData(LLUUID itemID)
public Object[] GetSerializationData(UUID itemID)
{
List<Object> data = new List<Object>();
@@ -140,7 +140,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
return data.ToArray();
}
public void CreateFromData(uint localID, LLUUID itemID, LLUUID objectID,
public void CreateFromData(uint localID, UUID itemID, UUID objectID,
Object[] data)
{
int idx = 0;