From b8d9737a47696952bedec33dface8f18df47341f Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Mon, 17 Sep 2007 12:52:03 +0000
Subject: fixing me some line endings
---
.../Region/Environment/Scenes/Scene.Inventory.cs | 854 ++++++++++-----------
OpenSim/Region/Environment/Scenes/SceneManager.cs | 474 ++++++------
.../Environment/Scenes/Scripting/IScriptHost.cs | 40 +-
.../Environment/Scenes/Scripting/NullScriptHost.cs | 112 +--
.../Scenes/Scripting/ScriptEngineInterface.cs | 86 +--
.../Scenes/Scripting/ScriptEngineLoader.cs | 248 +++---
6 files changed, 907 insertions(+), 907 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes')
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 70b34cf..a259dd0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1,427 +1,427 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Communications.Caches;
-using OpenSim.Framework.Data;
-using OpenSim.Framework.Utilities;
-using OpenSim.Region.Physics.Manager;
-
-namespace OpenSim.Region.Environment.Scenes
-{
- public partial class Scene
- {
- //split these method into this partial as a lot of these (hopefully) are only temporary and won't be needed once Caps is more complete
- // or at least some of they can be moved somewhere else
-
- public void AddInventoryItem(LLUUID userID, InventoryItemBase item)
- {
- if (this.Avatars.ContainsKey(userID))
- {
- this.AddInventoryItem(this.Avatars[userID].ControllingClient, item);
- }
- }
-
- public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item)
- {
- CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
- if (userInfo != null)
- {
- userInfo.AddItem(remoteClient.AgentId, item);
- remoteClient.SendInventoryItemUpdate(item);
- }
- }
-
- public LLUUID CapsUpdateInventoryItemAsset(LLUUID userID, LLUUID itemID, byte[] data)
- {
- if (this.Avatars.ContainsKey(userID))
- {
- return this.CapsUpdateInventoryItemAsset(this.Avatars[userID].ControllingClient, itemID, data);
- }
- return LLUUID.Zero;
- }
-
- public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data)
- {
- CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
- if (userInfo != null)
- {
- if (userInfo.RootFolder != null)
- {
- InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
- if (item != null)
- {
- AssetBase asset;
- asset = new AssetBase();
- asset.FullID = LLUUID.Random();
- asset.Type = (sbyte)item.assetType;
- asset.InvType = (sbyte)item.invType;
- asset.Name = item.inventoryName;
- asset.Data = data;
- commsManager.AssetCache.AddAsset(asset);
-
- item.assetID = asset.FullID;
- userInfo.UpdateItem(remoteClient.AgentId, item);
-
- // remoteClient.SendInventoryItemUpdate(item);
- if (item.invType == 7)
- {
- //do we want to know about updated note cards?
- }
- else if (item.invType == 10)
- {
- // do we want to know about updated scripts
- }
-
- return (asset.FullID);
- }
- }
- }
- return LLUUID.Zero;
- }
-
- public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID)
- {
- CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
- if (userInfo != null)
- {
- if (userInfo.RootFolder != null)
- {
- InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
- if (item != null)
- {
- AgentAssetTransactions transactions = commsManager.TransactionsManager.GetUserTransActions(remoteClient.AgentId);
- if (transactions != null)
- {
- AssetBase asset = null;
- bool addToCache = false;
-
- asset = commsManager.AssetCache.GetAsset(assetID);
- if (asset == null)
- {
- asset = transactions.GetTransactionAsset(transactionID);
- addToCache = true;
- }
-
- if (asset != null)
- {
- if (asset.FullID == assetID)
- {
- asset.Name = item.inventoryName;
- asset.Description = item.inventoryDescription;
- asset.InvType = (sbyte)item.invType;
- asset.Type = (sbyte)item.assetType;
- item.assetID = asset.FullID;
-
- if (addToCache)
- {
- commsManager.AssetCache.AddAsset(asset);
- }
-
- userInfo.UpdateItem(remoteClient.AgentId, item);
- }
- }
- }
- }
- }
- }
- }
-
- ///
- /// temporary method to test out creating new inventory items
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask)
- {
- if (transActionID == LLUUID.Zero)
- {
- CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
- if (userInfo != null)
- {
- AssetBase asset = new AssetBase();
- asset.Name = name;
- asset.Description = description;
- asset.InvType = invType;
- asset.Type = type;
- asset.FullID = LLUUID.Random();
- asset.Data = new byte[1];
- this.commsManager.AssetCache.AddAsset(asset);
-
- InventoryItemBase item = new InventoryItemBase();
- item.avatarID = remoteClient.AgentId;
- item.creatorsID = remoteClient.AgentId;
- item.inventoryID = LLUUID.Random();
- item.assetID = asset.FullID;
- item.inventoryDescription = description;
- item.inventoryName = name;
- item.assetType = invType;
- item.invType = invType;
- item.parentFolderID = folderID;
- item.inventoryCurrentPermissions = 2147483647;
- item.inventoryNextPermissions = nextOwnerMask;
-
- userInfo.AddItem(remoteClient.AgentId, item);
- remoteClient.SendInventoryItemUpdate(item);
- }
- }
- else
- {
- commsManager.TransactionsManager.HandleInventoryFromTransaction(remoteClient, transActionID, folderID, callbackID, description, name, invType, type, wearableType, nextOwnerMask);
- //System.Console.WriteLine("request to create inventory item from transaction " + transActionID);
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- public void RequestTaskInventory(IClientAPI remoteClient, uint primLocalID)
- {
- bool hasPrim = false;
- foreach (EntityBase ent in Entities.Values)
- {
- if (ent is SceneObjectGroup)
- {
- hasPrim = ((SceneObjectGroup)ent).HasChildPrim(primLocalID);
- if (hasPrim != false)
- {
- bool fileChange = ((SceneObjectGroup)ent).GetPartInventoryFileName(remoteClient, primLocalID);
- if (fileChange)
- {
- if (this.XferManager != null)
- {
- ((SceneObjectGroup)ent).RequestInventoryFile(primLocalID, XferManager);
- }
- }
- break;
- }
- }
- }
- }
-
- public void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID)
- {
- bool hasPrim = false;
- foreach (EntityBase ent in Entities.Values)
- {
- if (ent is SceneObjectGroup)
- {
- hasPrim = ((SceneObjectGroup)ent).HasChildPrim(localID);
- if (hasPrim != false)
- {
- int type = ((SceneObjectGroup)ent).RemoveInventoryItem(remoteClient, localID, itemID);
- ((SceneObjectGroup)ent).GetProperites(remoteClient);
- if (type == 10)
- {
- this.EventManager.TriggerRemoveScript(localID, itemID);
- }
- }
- }
- }
- }
-
- public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID)
- {
- CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
- LLUUID copyID = LLUUID.Random();
- if (userInfo != null)
- {
- if (userInfo.RootFolder != null)
- {
- InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
- if (item != null)
- {
- bool isTexture = false;
- bool rezzed = false;
- if (item.invType == 0)
- {
- isTexture = true;
- }
- AssetBase rezAsset = commsManager.AssetCache.GetAsset(item.assetID, isTexture);
- if (rezAsset != null)
- {
- string script = Util.FieldToString(rezAsset.Data);
- //Console.WriteLine("rez script "+script);
- this.EventManager.TriggerRezScript(localID, copyID, script);
- rezzed = true;
- }
- else
- {
- //lets try once more incase the asset cache is being slow getting the asset from server
- rezAsset = commsManager.AssetCache.GetAsset(item.assetID, isTexture);
- if (rezAsset != null)
- {
- string script = Util.FieldToString(rezAsset.Data);
- // Console.WriteLine("rez script " + script);
- this.EventManager.TriggerRezScript(localID, copyID, script);
- rezzed = true;
- }
- }
-
- if (rezzed)
- {
- bool hasPrim = false;
- foreach (EntityBase ent in Entities.Values)
- {
- if (ent is SceneObjectGroup)
- {
- hasPrim = ((SceneObjectGroup)ent).HasChildPrim(localID);
- if (hasPrim != false)
- {
-
- bool added = ((SceneObjectGroup)ent).AddInventoryItem(remoteClient, localID, item, copyID);
- ((SceneObjectGroup)ent).GetProperites(remoteClient);
- }
- }
- }
- }
- }
- }
- }
- }
-
- ///
- ///
- ///
- ///
- ///
- public void DeRezObject(Packet packet, IClientAPI remoteClient)
- {
- DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;
-
- if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
- {
- //currently following code not used (or don't know of any case of destination being zero
- }
- else
- {
- foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
- {
- EntityBase selectedEnt = null;
- //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
- foreach (EntityBase ent in this.Entities.Values)
- {
- if (ent.LocalId == Data.ObjectLocalID)
- {
- selectedEnt = ent;
- break;
- }
- }
- if (selectedEnt != null)
- {
- if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup)selectedEnt).UUID))
- {
- string sceneObjectXml = ((SceneObjectGroup)selectedEnt).ToXmlString();
- CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
- if (userInfo != null)
- {
- AssetBase asset = new AssetBase();
- asset.Name = ((SceneObjectGroup)selectedEnt).GetPartName(selectedEnt.LocalId);
- asset.Description = ((SceneObjectGroup)selectedEnt).GetPartDescription(selectedEnt.LocalId);
- asset.InvType = 6;
- asset.Type = 6;
- asset.FullID = LLUUID.Random();
- asset.Data = Helpers.StringToField(sceneObjectXml);
- commsManager.AssetCache.AddAsset(asset);
-
-
- InventoryItemBase item = new InventoryItemBase();
- item.avatarID = remoteClient.AgentId;
- item.creatorsID = remoteClient.AgentId;
- item.inventoryID = LLUUID.Random();
- item.assetID = asset.FullID;
- item.inventoryDescription = asset.Description;
- item.inventoryName = asset.Name;
- item.assetType = asset.Type;
- item.invType = asset.InvType;
- item.parentFolderID = DeRezPacket.AgentBlock.DestinationID;
- item.inventoryCurrentPermissions = 2147483647;
- item.inventoryNextPermissions = 2147483647;
-
- userInfo.AddItem(remoteClient.AgentId, item);
- remoteClient.SendInventoryItemUpdate(item);
- }
-
- SceneObjectPart rootPart = ((SceneObjectGroup)selectedEnt).GetChildPart(((SceneObjectGroup)selectedEnt).UUID);
- if (rootPart.PhysActor != null)
- {
- this.phyScene.RemovePrim(rootPart.PhysActor);
- rootPart.PhysActor = null;
- }
-
- storageManager.DataStore.RemoveObject(((SceneObjectGroup)selectedEnt).UUID, m_regInfo.SimUUID);
- ((SceneObjectGroup)selectedEnt).DeleteGroup();
-
- lock (Entities)
- {
- Entities.Remove(((SceneObjectGroup)selectedEnt).UUID);
- }
- ((SceneObjectGroup)selectedEnt).DeleteParts();
- }
- }
- }
- }
- }
-
- public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos)
- {
- CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
- if (userInfo != null)
- {
- if (userInfo.RootFolder != null)
- {
- InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
- if (item != null)
- {
- AssetBase rezAsset = commsManager.AssetCache.GetAsset(item.assetID, false);
- if (rezAsset != null)
- {
- this.AddRezObject(Util.FieldToString(rezAsset.Data), pos);
- userInfo.DeleteItem(remoteClient.AgentId, item);
- remoteClient.SendRemoveInventoryItem(itemID);
- }
- else
- {
- //lets try once more incase the asset cache is being slow getting the asset from server
- rezAsset = commsManager.AssetCache.GetAsset(item.assetID, false);
- if (rezAsset != null)
- {
- this.AddRezObject(Util.FieldToString(rezAsset.Data), pos);
- userInfo.DeleteItem(remoteClient.AgentId, item);
- remoteClient.SendRemoveInventoryItem(itemID);
- }
- }
- }
- }
- }
- }
-
- private void AddRezObject(string xmlData, LLVector3 pos)
- {
- SceneObjectGroup group = new SceneObjectGroup(this, this.m_regionHandle, xmlData);
- this.AddEntity(group);
- group.AbsolutePosition = pos;
- SceneObjectPart rootPart = group.GetChildPart(group.UUID);
- if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
- rootPart.PhysActor = phyScene.AddPrim(
- new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, rootPart.AbsolutePosition.Z),
- new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
- new Axiom.Math.Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
- rootPart.RotationOffset.Y, rootPart.RotationOffset.Z));
- }
- }
-
-}
+using System;
+using System.IO;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Communications.Caches;
+using OpenSim.Framework.Data;
+using OpenSim.Framework.Utilities;
+using OpenSim.Region.Physics.Manager;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ public partial class Scene
+ {
+ //split these method into this partial as a lot of these (hopefully) are only temporary and won't be needed once Caps is more complete
+ // or at least some of they can be moved somewhere else
+
+ public void AddInventoryItem(LLUUID userID, InventoryItemBase item)
+ {
+ if (this.Avatars.ContainsKey(userID))
+ {
+ this.AddInventoryItem(this.Avatars[userID].ControllingClient, item);
+ }
+ }
+
+ public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item)
+ {
+ CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
+ if (userInfo != null)
+ {
+ userInfo.AddItem(remoteClient.AgentId, item);
+ remoteClient.SendInventoryItemUpdate(item);
+ }
+ }
+
+ public LLUUID CapsUpdateInventoryItemAsset(LLUUID userID, LLUUID itemID, byte[] data)
+ {
+ if (this.Avatars.ContainsKey(userID))
+ {
+ return this.CapsUpdateInventoryItemAsset(this.Avatars[userID].ControllingClient, itemID, data);
+ }
+ return LLUUID.Zero;
+ }
+
+ public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data)
+ {
+ CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
+ if (userInfo != null)
+ {
+ if (userInfo.RootFolder != null)
+ {
+ InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
+ if (item != null)
+ {
+ AssetBase asset;
+ asset = new AssetBase();
+ asset.FullID = LLUUID.Random();
+ asset.Type = (sbyte)item.assetType;
+ asset.InvType = (sbyte)item.invType;
+ asset.Name = item.inventoryName;
+ asset.Data = data;
+ commsManager.AssetCache.AddAsset(asset);
+
+ item.assetID = asset.FullID;
+ userInfo.UpdateItem(remoteClient.AgentId, item);
+
+ // remoteClient.SendInventoryItemUpdate(item);
+ if (item.invType == 7)
+ {
+ //do we want to know about updated note cards?
+ }
+ else if (item.invType == 10)
+ {
+ // do we want to know about updated scripts
+ }
+
+ return (asset.FullID);
+ }
+ }
+ }
+ return LLUUID.Zero;
+ }
+
+ public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID)
+ {
+ CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
+ if (userInfo != null)
+ {
+ if (userInfo.RootFolder != null)
+ {
+ InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
+ if (item != null)
+ {
+ AgentAssetTransactions transactions = commsManager.TransactionsManager.GetUserTransActions(remoteClient.AgentId);
+ if (transactions != null)
+ {
+ AssetBase asset = null;
+ bool addToCache = false;
+
+ asset = commsManager.AssetCache.GetAsset(assetID);
+ if (asset == null)
+ {
+ asset = transactions.GetTransactionAsset(transactionID);
+ addToCache = true;
+ }
+
+ if (asset != null)
+ {
+ if (asset.FullID == assetID)
+ {
+ asset.Name = item.inventoryName;
+ asset.Description = item.inventoryDescription;
+ asset.InvType = (sbyte)item.invType;
+ asset.Type = (sbyte)item.assetType;
+ item.assetID = asset.FullID;
+
+ if (addToCache)
+ {
+ commsManager.AssetCache.AddAsset(asset);
+ }
+
+ userInfo.UpdateItem(remoteClient.AgentId, item);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ ///
+ /// temporary method to test out creating new inventory items
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask)
+ {
+ if (transActionID == LLUUID.Zero)
+ {
+ CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
+ if (userInfo != null)
+ {
+ AssetBase asset = new AssetBase();
+ asset.Name = name;
+ asset.Description = description;
+ asset.InvType = invType;
+ asset.Type = type;
+ asset.FullID = LLUUID.Random();
+ asset.Data = new byte[1];
+ this.commsManager.AssetCache.AddAsset(asset);
+
+ InventoryItemBase item = new InventoryItemBase();
+ item.avatarID = remoteClient.AgentId;
+ item.creatorsID = remoteClient.AgentId;
+ item.inventoryID = LLUUID.Random();
+ item.assetID = asset.FullID;
+ item.inventoryDescription = description;
+ item.inventoryName = name;
+ item.assetType = invType;
+ item.invType = invType;
+ item.parentFolderID = folderID;
+ item.inventoryCurrentPermissions = 2147483647;
+ item.inventoryNextPermissions = nextOwnerMask;
+
+ userInfo.AddItem(remoteClient.AgentId, item);
+ remoteClient.SendInventoryItemUpdate(item);
+ }
+ }
+ else
+ {
+ commsManager.TransactionsManager.HandleInventoryFromTransaction(remoteClient, transActionID, folderID, callbackID, description, name, invType, type, wearableType, nextOwnerMask);
+ //System.Console.WriteLine("request to create inventory item from transaction " + transActionID);
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void RequestTaskInventory(IClientAPI remoteClient, uint primLocalID)
+ {
+ bool hasPrim = false;
+ foreach (EntityBase ent in Entities.Values)
+ {
+ if (ent is SceneObjectGroup)
+ {
+ hasPrim = ((SceneObjectGroup)ent).HasChildPrim(primLocalID);
+ if (hasPrim != false)
+ {
+ bool fileChange = ((SceneObjectGroup)ent).GetPartInventoryFileName(remoteClient, primLocalID);
+ if (fileChange)
+ {
+ if (this.XferManager != null)
+ {
+ ((SceneObjectGroup)ent).RequestInventoryFile(primLocalID, XferManager);
+ }
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ public void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID)
+ {
+ bool hasPrim = false;
+ foreach (EntityBase ent in Entities.Values)
+ {
+ if (ent is SceneObjectGroup)
+ {
+ hasPrim = ((SceneObjectGroup)ent).HasChildPrim(localID);
+ if (hasPrim != false)
+ {
+ int type = ((SceneObjectGroup)ent).RemoveInventoryItem(remoteClient, localID, itemID);
+ ((SceneObjectGroup)ent).GetProperites(remoteClient);
+ if (type == 10)
+ {
+ this.EventManager.TriggerRemoveScript(localID, itemID);
+ }
+ }
+ }
+ }
+ }
+
+ public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID)
+ {
+ CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
+ LLUUID copyID = LLUUID.Random();
+ if (userInfo != null)
+ {
+ if (userInfo.RootFolder != null)
+ {
+ InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
+ if (item != null)
+ {
+ bool isTexture = false;
+ bool rezzed = false;
+ if (item.invType == 0)
+ {
+ isTexture = true;
+ }
+ AssetBase rezAsset = commsManager.AssetCache.GetAsset(item.assetID, isTexture);
+ if (rezAsset != null)
+ {
+ string script = Util.FieldToString(rezAsset.Data);
+ //Console.WriteLine("rez script "+script);
+ this.EventManager.TriggerRezScript(localID, copyID, script);
+ rezzed = true;
+ }
+ else
+ {
+ //lets try once more incase the asset cache is being slow getting the asset from server
+ rezAsset = commsManager.AssetCache.GetAsset(item.assetID, isTexture);
+ if (rezAsset != null)
+ {
+ string script = Util.FieldToString(rezAsset.Data);
+ // Console.WriteLine("rez script " + script);
+ this.EventManager.TriggerRezScript(localID, copyID, script);
+ rezzed = true;
+ }
+ }
+
+ if (rezzed)
+ {
+ bool hasPrim = false;
+ foreach (EntityBase ent in Entities.Values)
+ {
+ if (ent is SceneObjectGroup)
+ {
+ hasPrim = ((SceneObjectGroup)ent).HasChildPrim(localID);
+ if (hasPrim != false)
+ {
+
+ bool added = ((SceneObjectGroup)ent).AddInventoryItem(remoteClient, localID, item, copyID);
+ ((SceneObjectGroup)ent).GetProperites(remoteClient);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void DeRezObject(Packet packet, IClientAPI remoteClient)
+ {
+ DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;
+
+ if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
+ {
+ //currently following code not used (or don't know of any case of destination being zero
+ }
+ else
+ {
+ foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
+ {
+ EntityBase selectedEnt = null;
+ //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
+ foreach (EntityBase ent in this.Entities.Values)
+ {
+ if (ent.LocalId == Data.ObjectLocalID)
+ {
+ selectedEnt = ent;
+ break;
+ }
+ }
+ if (selectedEnt != null)
+ {
+ if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup)selectedEnt).UUID))
+ {
+ string sceneObjectXml = ((SceneObjectGroup)selectedEnt).ToXmlString();
+ CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
+ if (userInfo != null)
+ {
+ AssetBase asset = new AssetBase();
+ asset.Name = ((SceneObjectGroup)selectedEnt).GetPartName(selectedEnt.LocalId);
+ asset.Description = ((SceneObjectGroup)selectedEnt).GetPartDescription(selectedEnt.LocalId);
+ asset.InvType = 6;
+ asset.Type = 6;
+ asset.FullID = LLUUID.Random();
+ asset.Data = Helpers.StringToField(sceneObjectXml);
+ commsManager.AssetCache.AddAsset(asset);
+
+
+ InventoryItemBase item = new InventoryItemBase();
+ item.avatarID = remoteClient.AgentId;
+ item.creatorsID = remoteClient.AgentId;
+ item.inventoryID = LLUUID.Random();
+ item.assetID = asset.FullID;
+ item.inventoryDescription = asset.Description;
+ item.inventoryName = asset.Name;
+ item.assetType = asset.Type;
+ item.invType = asset.InvType;
+ item.parentFolderID = DeRezPacket.AgentBlock.DestinationID;
+ item.inventoryCurrentPermissions = 2147483647;
+ item.inventoryNextPermissions = 2147483647;
+
+ userInfo.AddItem(remoteClient.AgentId, item);
+ remoteClient.SendInventoryItemUpdate(item);
+ }
+
+ SceneObjectPart rootPart = ((SceneObjectGroup)selectedEnt).GetChildPart(((SceneObjectGroup)selectedEnt).UUID);
+ if (rootPart.PhysActor != null)
+ {
+ this.phyScene.RemovePrim(rootPart.PhysActor);
+ rootPart.PhysActor = null;
+ }
+
+ storageManager.DataStore.RemoveObject(((SceneObjectGroup)selectedEnt).UUID, m_regInfo.SimUUID);
+ ((SceneObjectGroup)selectedEnt).DeleteGroup();
+
+ lock (Entities)
+ {
+ Entities.Remove(((SceneObjectGroup)selectedEnt).UUID);
+ }
+ ((SceneObjectGroup)selectedEnt).DeleteParts();
+ }
+ }
+ }
+ }
+ }
+
+ public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos)
+ {
+ CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
+ if (userInfo != null)
+ {
+ if (userInfo.RootFolder != null)
+ {
+ InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
+ if (item != null)
+ {
+ AssetBase rezAsset = commsManager.AssetCache.GetAsset(item.assetID, false);
+ if (rezAsset != null)
+ {
+ this.AddRezObject(Util.FieldToString(rezAsset.Data), pos);
+ userInfo.DeleteItem(remoteClient.AgentId, item);
+ remoteClient.SendRemoveInventoryItem(itemID);
+ }
+ else
+ {
+ //lets try once more incase the asset cache is being slow getting the asset from server
+ rezAsset = commsManager.AssetCache.GetAsset(item.assetID, false);
+ if (rezAsset != null)
+ {
+ this.AddRezObject(Util.FieldToString(rezAsset.Data), pos);
+ userInfo.DeleteItem(remoteClient.AgentId, item);
+ remoteClient.SendRemoveInventoryItem(itemID);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void AddRezObject(string xmlData, LLVector3 pos)
+ {
+ SceneObjectGroup group = new SceneObjectGroup(this, this.m_regionHandle, xmlData);
+ this.AddEntity(group);
+ group.AbsolutePosition = pos;
+ SceneObjectPart rootPart = group.GetChildPart(group.UUID);
+ if ((rootPart.ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
+ rootPart.PhysActor = phyScene.AddPrim(
+ new PhysicsVector(rootPart.AbsolutePosition.X, rootPart.AbsolutePosition.Y, rootPart.AbsolutePosition.Z),
+ new PhysicsVector(rootPart.Scale.X, rootPart.Scale.Y, rootPart.Scale.Z),
+ new Axiom.Math.Quaternion(rootPart.RotationOffset.W, rootPart.RotationOffset.X,
+ rootPart.RotationOffset.Y, rootPart.RotationOffset.Z));
+ }
+ }
+
+}
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index dfac406..4a99a80 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -1,237 +1,237 @@
-using System.Collections.Generic;
-using System;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Types;
-
-namespace OpenSim.Region.Environment.Scenes
-{
- public class SceneManager
- {
- private readonly List m_localScenes;
- private Scene m_currentScene = null;
- public Scene CurrentScene
- {
- get
- {
- return m_currentScene;
- }
- }
-
- private Scene CurrentOrFirstScene
- {
- get
- {
- if (m_currentScene == null)
- {
- return m_localScenes[0];
- }
- else
- {
- return m_currentScene;
- }
- }
- }
-
- public SceneManager()
- {
- m_localScenes = new List();
- }
-
- public void Close()
- {
- for (int i = 0; i < m_localScenes.Count; i++)
- {
- m_localScenes[i].Close();
- }
- }
-
- public void Add(Scene scene)
- {
- m_localScenes.Add(scene);
- }
-
- public void SavePrimsToXml(string filename)
- {
- CurrentOrFirstScene.SavePrimsToXml(filename);
- }
-
- public void LoadPrimsFromXml(string filename)
- {
- CurrentOrFirstScene.LoadPrimsFromXml(filename);
- }
-
- public bool RunTerrainCmd(string[] cmdparams, ref string result)
- {
- if (m_currentScene == null)
- {
- bool success = true;
- foreach (Scene scene in m_localScenes)
- {
- if (!scene.Terrain.RunTerrainCmd(cmdparams, ref result, scene.RegionInfo.RegionName))
- {
- success = false;
- }
- }
-
- return success;
- }
- else
- {
- return m_currentScene.Terrain.RunTerrainCmd(cmdparams, ref result, m_currentScene.RegionInfo.RegionName);
- }
- }
-
- public void SendCommandToScripts(string[] cmdparams)
- {
- ForEach(delegate(Scene scene)
- {
- scene.SendCommandToScripts(cmdparams);
- });
- }
-
- public void BypassPermissions(bool bypassPermissions)
- {
- ForEach(delegate(Scene scene)
- {
- scene.PermissionsMngr.BypassPermissions = bypassPermissions;
- });
- }
-
- private void ForEach(Action func)
- {
- if (m_currentScene == null)
- {
- m_localScenes.ForEach(func);
- }
- else
- {
- func(m_currentScene);
- }
- }
-
- public void Backup()
- {
- ForEach(delegate(Scene scene)
- {
- scene.Backup();
- });
- }
-
- public void HandleAlertCommand(string[] cmdparams)
- {
- ForEach(delegate(Scene scene)
- {
- scene.HandleAlertCommand(cmdparams);
- });
- }
-
- public bool TrySetCurrentRegion(string regionName)
- {
- if ((String.Compare(regionName, "root") == 0) || (String.Compare(regionName, "..") == 0))
- {
- m_currentScene = null;
- return true;
- }
- else
- {
- Console.WriteLine("Searching for Region: '" + regionName + "'");
- Scene foundScene = null;
-
- foreach (Scene scene in m_localScenes)
- {
- if (String.Compare(scene.RegionInfo.RegionName, regionName, true) == 0)
- {
- m_currentScene = scene;
- return true;
- }
- }
-
- return false;
- }
- }
-
- public void DebugPacket(LogBase log, int newDebug)
- {
- ForEach(delegate(Scene scene)
- {
- foreach (EntityBase entity in scene.Entities.Values)
- {
- if (entity is ScenePresence)
- {
- ScenePresence scenePrescence = entity as ScenePresence;
- if (!scenePrescence.childAgent)
- {
- log.Error(String.Format("Packet debug for {0} {1} set to {2}",
- scenePrescence.Firstname, scenePrescence.Lastname,
- newDebug));
-
- scenePrescence.ControllingClient.SetDebug(newDebug);
- }
- }
- }
- });
- }
-
- public List GetAvatars()
- {
- List avatars = new List();
-
- ForEach(delegate(Scene scene)
- {
- foreach (EntityBase entity in scene.Entities.Values)
- {
- if (entity is ScenePresence)
- {
- ScenePresence scenePrescence = entity as ScenePresence;
- if (!scenePrescence.childAgent)
- {
- avatars.Add(scenePrescence);
- }
- }
- }
- });
-
- return avatars;
- }
-
- public RegionInfo GetRegionInfo(ulong regionHandle)
- {
- foreach (Scene scene in m_localScenes)
- {
- if (scene.RegionInfo.RegionHandle == regionHandle)
- {
- return scene.RegionInfo;
- }
- }
-
- return null;
- }
-
- public void SetTimePhase(int timePhase)
- {
- ForEach(delegate(Scene scene)
- {
- scene.SetTimePhase(
- timePhase)
- ;
- });
- }
-
-
- public void ForceClientUpdate()
- {
- ForEach(delegate(Scene scene)
- {
- scene.ForceClientUpdate();
- });
- }
-
- public void HandleEditCommand(string[] cmdparams)
- {
- ForEach(delegate(Scene scene)
- {
- scene.HandleEditCommand(cmdparams);
- });
- }
- }
-}
+using System.Collections.Generic;
+using System;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Region.Environment.Scenes
+{
+ public class SceneManager
+ {
+ private readonly List m_localScenes;
+ private Scene m_currentScene = null;
+ public Scene CurrentScene
+ {
+ get
+ {
+ return m_currentScene;
+ }
+ }
+
+ private Scene CurrentOrFirstScene
+ {
+ get
+ {
+ if (m_currentScene == null)
+ {
+ return m_localScenes[0];
+ }
+ else
+ {
+ return m_currentScene;
+ }
+ }
+ }
+
+ public SceneManager()
+ {
+ m_localScenes = new List();
+ }
+
+ public void Close()
+ {
+ for (int i = 0; i < m_localScenes.Count; i++)
+ {
+ m_localScenes[i].Close();
+ }
+ }
+
+ public void Add(Scene scene)
+ {
+ m_localScenes.Add(scene);
+ }
+
+ public void SavePrimsToXml(string filename)
+ {
+ CurrentOrFirstScene.SavePrimsToXml(filename);
+ }
+
+ public void LoadPrimsFromXml(string filename)
+ {
+ CurrentOrFirstScene.LoadPrimsFromXml(filename);
+ }
+
+ public bool RunTerrainCmd(string[] cmdparams, ref string result)
+ {
+ if (m_currentScene == null)
+ {
+ bool success = true;
+ foreach (Scene scene in m_localScenes)
+ {
+ if (!scene.Terrain.RunTerrainCmd(cmdparams, ref result, scene.RegionInfo.RegionName))
+ {
+ success = false;
+ }
+ }
+
+ return success;
+ }
+ else
+ {
+ return m_currentScene.Terrain.RunTerrainCmd(cmdparams, ref result, m_currentScene.RegionInfo.RegionName);
+ }
+ }
+
+ public void SendCommandToScripts(string[] cmdparams)
+ {
+ ForEach(delegate(Scene scene)
+ {
+ scene.SendCommandToScripts(cmdparams);
+ });
+ }
+
+ public void BypassPermissions(bool bypassPermissions)
+ {
+ ForEach(delegate(Scene scene)
+ {
+ scene.PermissionsMngr.BypassPermissions = bypassPermissions;
+ });
+ }
+
+ private void ForEach(Action func)
+ {
+ if (m_currentScene == null)
+ {
+ m_localScenes.ForEach(func);
+ }
+ else
+ {
+ func(m_currentScene);
+ }
+ }
+
+ public void Backup()
+ {
+ ForEach(delegate(Scene scene)
+ {
+ scene.Backup();
+ });
+ }
+
+ public void HandleAlertCommand(string[] cmdparams)
+ {
+ ForEach(delegate(Scene scene)
+ {
+ scene.HandleAlertCommand(cmdparams);
+ });
+ }
+
+ public bool TrySetCurrentRegion(string regionName)
+ {
+ if ((String.Compare(regionName, "root") == 0) || (String.Compare(regionName, "..") == 0))
+ {
+ m_currentScene = null;
+ return true;
+ }
+ else
+ {
+ Console.WriteLine("Searching for Region: '" + regionName + "'");
+ Scene foundScene = null;
+
+ foreach (Scene scene in m_localScenes)
+ {
+ if (String.Compare(scene.RegionInfo.RegionName, regionName, true) == 0)
+ {
+ m_currentScene = scene;
+ return true;
+ }
+ }
+
+ return false;
+ }
+ }
+
+ public void DebugPacket(LogBase log, int newDebug)
+ {
+ ForEach(delegate(Scene scene)
+ {
+ foreach (EntityBase entity in scene.Entities.Values)
+ {
+ if (entity is ScenePresence)
+ {
+ ScenePresence scenePrescence = entity as ScenePresence;
+ if (!scenePrescence.childAgent)
+ {
+ log.Error(String.Format("Packet debug for {0} {1} set to {2}",
+ scenePrescence.Firstname, scenePrescence.Lastname,
+ newDebug));
+
+ scenePrescence.ControllingClient.SetDebug(newDebug);
+ }
+ }
+ }
+ });
+ }
+
+ public List GetAvatars()
+ {
+ List avatars = new List();
+
+ ForEach(delegate(Scene scene)
+ {
+ foreach (EntityBase entity in scene.Entities.Values)
+ {
+ if (entity is ScenePresence)
+ {
+ ScenePresence scenePrescence = entity as ScenePresence;
+ if (!scenePrescence.childAgent)
+ {
+ avatars.Add(scenePrescence);
+ }
+ }
+ }
+ });
+
+ return avatars;
+ }
+
+ public RegionInfo GetRegionInfo(ulong regionHandle)
+ {
+ foreach (Scene scene in m_localScenes)
+ {
+ if (scene.RegionInfo.RegionHandle == regionHandle)
+ {
+ return scene.RegionInfo;
+ }
+ }
+
+ return null;
+ }
+
+ public void SetTimePhase(int timePhase)
+ {
+ ForEach(delegate(Scene scene)
+ {
+ scene.SetTimePhase(
+ timePhase)
+ ;
+ });
+ }
+
+
+ public void ForceClientUpdate()
+ {
+ ForEach(delegate(Scene scene)
+ {
+ scene.ForceClientUpdate();
+ });
+ }
+
+ public void HandleEditCommand(string[] cmdparams)
+ {
+ ForEach(delegate(Scene scene)
+ {
+ scene.HandleEditCommand(cmdparams);
+ });
+ }
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
index 2f248ce..7cf9cb7 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
@@ -1,20 +1,20 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scenes.Scripting
-{
- public interface IScriptHost
- {
- string Name { get; set;}
- string SitName{ get; set;}
- string TouchName { get; set;}
- string Description { get; set; }
- LLUUID UUID { get; }
- LLUUID ObjectOwner { get;}
- LLUUID ObjectCreator { get; }
- LLVector3 AbsolutePosition { get; }
- void SetText(string text, Axiom.Math.Vector3 color, double alpha);
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Environment.Scenes.Scripting
+{
+ public interface IScriptHost
+ {
+ string Name { get; set;}
+ string SitName{ get; set;}
+ string TouchName { get; set;}
+ string Description { get; set; }
+ LLUUID UUID { get; }
+ LLUUID ObjectOwner { get;}
+ LLUUID ObjectCreator { get; }
+ LLVector3 AbsolutePosition { get; }
+ void SetText(string text, Axiom.Math.Vector3 color, double alpha);
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
index 5e3dcae..875e4cb 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -1,56 +1,56 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using libsecondlife;
-
-namespace OpenSim.Region.Environment.Scenes.Scripting
-{
- public class NullScriptHost : IScriptHost
- {
-
- LLVector3 m_pos = new LLVector3( 128, 128, 30 );
- public string Name
- {
- get { return "Object"; }
- set { }
- }
-
- public string SitName
- {
- get { return ""; }
- set { }
- }
-
- public string TouchName
- {
- get { return ""; }
- set { }
- }
-
- public string Description
- {
- get { return ""; }
- set { }
- }
-
- public LLUUID UUID
- {
- get { return LLUUID.Zero; }
- }
-
- public LLUUID ObjectOwner
- { get { return LLUUID.Zero; } }
-
- public LLUUID ObjectCreator { get { return LLUUID.Zero; } }
-
- public LLVector3 AbsolutePosition
- {
- get { return m_pos; }
- }
-
- public void SetText(string text, Axiom.Math.Vector3 color, double alpha)
- {
- Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text);
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Environment.Scenes.Scripting
+{
+ public class NullScriptHost : IScriptHost
+ {
+
+ LLVector3 m_pos = new LLVector3( 128, 128, 30 );
+ public string Name
+ {
+ get { return "Object"; }
+ set { }
+ }
+
+ public string SitName
+ {
+ get { return ""; }
+ set { }
+ }
+
+ public string TouchName
+ {
+ get { return ""; }
+ set { }
+ }
+
+ public string Description
+ {
+ get { return ""; }
+ set { }
+ }
+
+ public LLUUID UUID
+ {
+ get { return LLUUID.Zero; }
+ }
+
+ public LLUUID ObjectOwner
+ { get { return LLUUID.Zero; } }
+
+ public LLUUID ObjectCreator { get { return LLUUID.Zero; } }
+
+ public LLVector3 AbsolutePosition
+ {
+ get { return m_pos; }
+ }
+
+ public void SetText(string text, Axiom.Math.Vector3 color, double alpha)
+ {
+ Console.WriteLine("Tried to SetText [{0}] on NullScriptHost", text);
+ }
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
index d3d58fe..5e8ff87 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
@@ -1,43 +1,43 @@
-/*
-* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-/* Original code: Tedd Hansen */
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenSim.Region.Environment.Scenes.Scripting;
-
-//TODO: WHERE TO PLACE THIS?
-namespace OpenSim.Region.Environment.Scenes.Scripting
-{
- public interface ScriptEngineInterface
- {
- void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger);
- void Shutdown();
-// void StartScript(string ScriptID, IScriptHost ObjectID);
- }
-}
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+/* Original code: Tedd Hansen */
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Region.Environment.Scenes.Scripting;
+
+//TODO: WHERE TO PLACE THIS?
+namespace OpenSim.Region.Environment.Scenes.Scripting
+{
+ public interface ScriptEngineInterface
+ {
+ void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger);
+ void Shutdown();
+// void StartScript(string ScriptID, IScriptHost ObjectID);
+ }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 3500545..83bd0ab 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -1,124 +1,124 @@
-/*
-* Copyright (c) Contributors, http://opensimulator.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the OpenSim Project nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-/* Original code: Tedd Hansen */
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Reflection;
-
-namespace OpenSim.Region.Environment.Scenes.Scripting
-{
- public class ScriptEngineLoader
- {
- private OpenSim.Framework.Console.LogBase m_log;
- public ScriptEngineLoader(OpenSim.Framework.Console.LogBase logger)
- {
- m_log = logger;
- }
-
- public ScriptEngineInterface LoadScriptEngine(string EngineName)
- {
- ScriptEngineInterface ret = null;
- try
- {
- ret = LoadAndInitAssembly(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
- "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
- }
- catch (Exception e)
- {
- m_log.Error("ScriptEngine", "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + e.StackTrace.ToString());
- }
- return ret;
- }
-
- ///
- /// Does actual loading and initialization of script Assembly
- ///
- /// AppDomain to load script into
- /// FileName of script assembly (.dll)
- ///
- private ScriptEngineInterface LoadAndInitAssembly(string FileName, string NameSpace)
- {
- //Common.SendToDebug("Loading ScriptEngine Assembly " + FileName);
- // Load .Net Assembly (.dll)
- // Initialize and return it
-
- // TODO: Add error handling
-
- Assembly a;
- //try
- //{
-
-
- // Load to default appdomain (temporary)
- a = Assembly.LoadFrom(FileName);
- // Load to specified appdomain
- // TODO: Insert security
- //a = FreeAppDomain.Load(FileName);
- //}
- //catch (Exception e)
- //{
- // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());
- //}
-
-
- //Console.WriteLine("Loading: " + FileName);
- //foreach (Type _t in a.GetTypes())
- //{
- // Console.WriteLine("Type: " + _t.ToString());
- //}
-
- Type t;
- //try
- //{
- t = a.GetType(NameSpace, true);
- //}
- //catch (Exception e)
- //{
- // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
- //}
-
- ScriptEngineInterface ret;
- //try
- //{
- ret = (ScriptEngineInterface)Activator.CreateInstance(t);
- //}
- //catch (Exception e)
- //{
- // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
- //}
-
- return ret;
-
-
- }
-
-
- }
-}
+/*
+* Copyright (c) Contributors, http://opensimulator.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the OpenSim Project nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+/* Original code: Tedd Hansen */
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Reflection;
+
+namespace OpenSim.Region.Environment.Scenes.Scripting
+{
+ public class ScriptEngineLoader
+ {
+ private OpenSim.Framework.Console.LogBase m_log;
+ public ScriptEngineLoader(OpenSim.Framework.Console.LogBase logger)
+ {
+ m_log = logger;
+ }
+
+ public ScriptEngineInterface LoadScriptEngine(string EngineName)
+ {
+ ScriptEngineInterface ret = null;
+ try
+ {
+ ret = LoadAndInitAssembly(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine." + EngineName + ".dll"),
+ "OpenSim.Region.ScriptEngine." + EngineName + ".ScriptEngine");
+ }
+ catch (Exception e)
+ {
+ m_log.Error("ScriptEngine", "Error loading assembly \"" + EngineName + "\": " + e.Message + ", " + e.StackTrace.ToString());
+ }
+ return ret;
+ }
+
+ ///
+ /// Does actual loading and initialization of script Assembly
+ ///
+ /// AppDomain to load script into
+ /// FileName of script assembly (.dll)
+ ///
+ private ScriptEngineInterface LoadAndInitAssembly(string FileName, string NameSpace)
+ {
+ //Common.SendToDebug("Loading ScriptEngine Assembly " + FileName);
+ // Load .Net Assembly (.dll)
+ // Initialize and return it
+
+ // TODO: Add error handling
+
+ Assembly a;
+ //try
+ //{
+
+
+ // Load to default appdomain (temporary)
+ a = Assembly.LoadFrom(FileName);
+ // Load to specified appdomain
+ // TODO: Insert security
+ //a = FreeAppDomain.Load(FileName);
+ //}
+ //catch (Exception e)
+ //{
+ // m_log.Error("ScriptEngine", "Error loading assembly \"" + FileName + "\": " + e.ToString());
+ //}
+
+
+ //Console.WriteLine("Loading: " + FileName);
+ //foreach (Type _t in a.GetTypes())
+ //{
+ // Console.WriteLine("Type: " + _t.ToString());
+ //}
+
+ Type t;
+ //try
+ //{
+ t = a.GetType(NameSpace, true);
+ //}
+ //catch (Exception e)
+ //{
+ // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
+ //}
+
+ ScriptEngineInterface ret;
+ //try
+ //{
+ ret = (ScriptEngineInterface)Activator.CreateInstance(t);
+ //}
+ //catch (Exception e)
+ //{
+ // m_log.Error("ScriptEngine", "Error initializing type \"" + NameSpace + "\" from \"" + FileName + "\": " + e.ToString());
+ //}
+
+ return ret;
+
+
+ }
+
+
+ }
+}
--
cgit v1.1