From fb7458be3185802c4511306c0cda7648d702de59 Mon Sep 17 00:00:00 2001
From: unknown
Date: Sun, 25 Apr 2010 10:13:13 +0300
Subject: Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
 "RetrieveAsset" and 'm_rootSceene' to m_rootScene'.

---
 .../Scripting/Minimodule/Interfaces/IInventoryItem.cs             | 2 +-
 .../Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
index 5fac189..16cd7e4 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IInventoryItem.cs
@@ -39,6 +39,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
     {
         int Type { get; }
         UUID AssetID { get; }
-        T RetreiveAsset<T>() where T : Asset, new();
+        T RetrieveAsset<T>() where T : Asset, new();
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
index 5bf29d7..bf85cbc 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/InventoryItem.cs
@@ -39,11 +39,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
     public class InventoryItem : IInventoryItem
     {
         TaskInventoryItem m_privateItem;
-        Scene m_rootSceene;
+        Scene m_rootScene;
         
         public InventoryItem(Scene rootScene, TaskInventoryItem internalItem)
         {
-            m_rootSceene = rootScene;
+            m_rootScene = rootScene;
             m_privateItem = internalItem;
         }
 
@@ -82,9 +82,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         public UUID AssetID { get { return m_privateItem.AssetID; } }
         
         // This method exposes OpenSim/OpenMetaverse internals and needs to be replaced with a IAsset specific to MRM.
-        public T RetreiveAsset<T>() where T : OpenMetaverse.Assets.Asset, new()
+        public T RetrieveAsset<T>() where T : OpenMetaverse.Assets.Asset, new()
         {
-            AssetBase a = m_rootSceene.AssetService.Get(AssetID.ToString());
+            AssetBase a = m_rootScene.AssetService.Get(AssetID.ToString());
             T result = new T();
 
             if ((sbyte)result.AssetType != a.Type)
-- 
cgit v1.1


From 806a2555f557e7a05002f67731b1e3105c9aab8b Mon Sep 17 00:00:00 2001
From: unknown
Date: Sun, 25 Apr 2010 17:21:05 +0300
Subject: Spelling in FriendsModule.cs: "filed to load" -> "failed to load"

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 312db38..23d5b3c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             if (m_FriendsService == null)
             {
-                m_log.Error("[FRIENDS]: No Connector defined in section Friends, or filed to load, cannot continue");
+                m_log.Error("[FRIENDS]: No Connector defined in section Friends, or failed to load, cannot continue");
                 throw new Exception("Connector load error");
             }
 
-- 
cgit v1.1


From aa56953411e04c260fe1938f5f184c775fea72b6 Mon Sep 17 00:00:00 2001
From: unknown
Date: Sat, 24 Apr 2010 18:52:23 +0300
Subject: Compiler.cs contained method GetCompilerOutput which, apparently, was
 not used, but exactly the same path was calculated inline. This patch does
 some minor refactoring by replacing inline path calculation with
 GetCompilerOutput. This doesn't actually affect anything, just minor
 prettifying of the code

---
 OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index d8c0ba5..f719683 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -261,13 +261,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         //    }
         //}
 
-        public object GetCompilerOutput(UUID assetID)
+        public string GetCompilerOutput(string assetID)
         {
             return Path.Combine(ScriptEnginesPath, Path.Combine(
                     m_scriptEngine.World.RegionInfo.RegionID.ToString(),
                     FilePrefix + "_compiled_" + assetID + ".dll"));
         }
 
+        public string GetCompilerOutput(UUID assetID)
+        {
+            return GetCompilerOutput(assetID.ToString());
+        }
+
         /// <summary>
         /// Converts script from LSL to CS and calls CompileFromCSText
         /// </summary>
@@ -279,9 +284,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             linemap = null;
             m_warnings.Clear();
 
-            assembly = Path.Combine(ScriptEnginesPath, Path.Combine(
-                    m_scriptEngine.World.RegionInfo.RegionID.ToString(),
-                    FilePrefix + "_compiled_" + asset + ".dll"));
+            assembly = GetCompilerOutput(asset);
 
             if (!Directory.Exists(ScriptEnginesPath))
             {
-- 
cgit v1.1