aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMike Mazur2009-02-17 01:36:44 +0000
committerMike Mazur2009-02-17 01:36:44 +0000
commit76c0935ec744f2d230489398f879eb7f42b11d37 (patch)
treea68253554e3899f10b6c341db369ce4a029dfaa5 /OpenSim/Region/ScriptEngine/Shared
parentMajor change to how appearance is managed, including changes in login and use... (diff)
downloadopensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.zip
opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.tar.gz
opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.tar.bz2
opensim-SC-76c0935ec744f2d230489398f879eb7f42b11d37.tar.xz
- remove the Metadata property from AssetBase and return all previous
properties as before - prefix private variables with m_ in AssetBase.cs - related to Mantis #3122, as mentioned in https://lists.berlios.de/pipermail/opensim-dev/2009-February/005088.html - all services will likely need to be upgraded after this commit
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e4ef236..eeef58b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1025,10 +1025,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1025 1025
1026 // Create new asset 1026 // Create new asset
1027 AssetBase asset = new AssetBase(); 1027 AssetBase asset = new AssetBase();
1028 asset.Metadata.Name = notecardName; 1028 asset.Name = notecardName;
1029 asset.Metadata.Description = "Script Generated Notecard"; 1029 asset.Description = "Script Generated Notecard";
1030 asset.Metadata.Type = 7; 1030 asset.Type = 7;
1031 asset.Metadata.FullID = UUID.Random(); 1031 asset.FullID = UUID.Random();
1032 string notecardData = ""; 1032 string notecardData = "";
1033 1033
1034 for (int i = 0; i < contents.Length; i++) { 1034 for (int i = 0; i < contents.Length; i++) {
@@ -1048,8 +1048,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1048 taskItem.ResetIDs(m_host.UUID); 1048 taskItem.ResetIDs(m_host.UUID);
1049 taskItem.ParentID = m_host.UUID; 1049 taskItem.ParentID = m_host.UUID;
1050 taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch(); 1050 taskItem.CreationDate = (uint)Util.UnixTimeSinceEpoch();
1051 taskItem.Name = asset.Metadata.Name; 1051 taskItem.Name = asset.Name;
1052 taskItem.Description = asset.Metadata.Description; 1052 taskItem.Description = asset.Description;
1053 taskItem.Type = 7; 1053 taskItem.Type = 7;
1054 taskItem.InvType = 7; 1054 taskItem.InvType = 7;
1055 taskItem.OwnerID = m_host.OwnerID; 1055 taskItem.OwnerID = m_host.OwnerID;
@@ -1063,7 +1063,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1063 taskItem.Flags = 0; 1063 taskItem.Flags = 0;
1064 taskItem.PermsGranter = UUID.Zero; 1064 taskItem.PermsGranter = UUID.Zero;
1065 taskItem.PermsMask = 0; 1065 taskItem.PermsMask = 0;
1066 taskItem.AssetID = asset.Metadata.FullID; 1066 taskItem.AssetID = asset.FullID;
1067 1067
1068 m_host.Inventory.AddInventoryItem(taskItem, false); 1068 m_host.Inventory.AddInventoryItem(taskItem, false);
1069 } 1069 }