diff options
Diffstat (limited to 'OpenSim')
6 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index 70efb85..fa316b1 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Grid.InventoryServer | |||
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | private GridInventoryService m_inventoryService; | 46 | private GridInventoryService m_inventoryService; |
47 | private HGInventoryService m_directInventoryService; | 47 | //private HGInventoryService m_directInventoryService; |
48 | 48 | ||
49 | public const string LogName = "INVENTORY"; | 49 | public const string LogName = "INVENTORY"; |
50 | 50 | ||
@@ -83,7 +83,7 @@ namespace OpenSim.Grid.InventoryServer | |||
83 | 83 | ||
84 | m_log.Info("[" + LogName + "]: Started HTTP server"); | 84 | m_log.Info("[" + LogName + "]: Started HTTP server"); |
85 | 85 | ||
86 | m_directInventoryService = new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL); | 86 | //m_directInventoryService = new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL); |
87 | 87 | ||
88 | base.StartupSpecific(); | 88 | base.StartupSpecific(); |
89 | 89 | ||
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs index 90104f2..8b2a5ca 100644 --- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs | |||
@@ -654,7 +654,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST | |||
654 | if (args["itemid"] != null) | 654 | if (args["itemid"] != null) |
655 | itemID = args["itemid"].AsUUID(); | 655 | itemID = args["itemid"].AsUUID(); |
656 | 656 | ||
657 | UUID regionID = m_localBackend.GetRegionID(regionhandle); | 657 | //UUID regionID = m_localBackend.GetRegionID(regionhandle); |
658 | 658 | ||
659 | // This is the meaning of PUT object | 659 | // This is the meaning of PUT object |
660 | bool result = m_localBackend.SendCreateObject(regionhandle, userID, itemID); | 660 | bool result = m_localBackend.SendCreateObject(regionhandle, userID, itemID); |
diff --git a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs index e164f08..98f31f6 100644 --- a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs +++ b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs | |||
@@ -37,8 +37,8 @@ namespace OpenSim.Region.CoreModules | |||
37 | { | 37 | { |
38 | public class CloudModule : ICloudModule | 38 | public class CloudModule : ICloudModule |
39 | { | 39 | { |
40 | private static readonly log4net.ILog m_log | 40 | // private static readonly log4net.ILog m_log |
41 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | private Random m_rndnums = new Random(Environment.TickCount); | 43 | private Random m_rndnums = new Random(Environment.TickCount); |
44 | private Scene m_scene = null; | 44 | private Scene m_scene = null; |
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index 700fe2f..a8c9ac5 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules | |||
47 | private uint m_frame = 0; | 47 | private uint m_frame = 0; |
48 | private uint m_frameLastUpdateClientArray = 0; | 48 | private uint m_frameLastUpdateClientArray = 0; |
49 | private int m_frameUpdateRate = 150; | 49 | private int m_frameUpdateRate = 150; |
50 | private Random m_rndnums = new Random(Environment.TickCount); | 50 | //private Random m_rndnums = new Random(Environment.TickCount); |
51 | private Scene m_scene = null; | 51 | private Scene m_scene = null; |
52 | private bool m_ready = false; | 52 | private bool m_ready = false; |
53 | 53 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0991171..3266703 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1744,8 +1744,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1744 | if (sp != null) | 1744 | if (sp != null) |
1745 | { | 1745 | { |
1746 | uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID); | 1746 | uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID); |
1747 | SceneObjectGroup sog = m_sceneGraph.RezSingleAttachment(sp.ControllingClient, itemID, attPt); | 1747 | m_sceneGraph.RezSingleAttachment(sp.ControllingClient, itemID, attPt); |
1748 | } | 1748 | } |
1749 | |||
1749 | return false; | 1750 | return false; |
1750 | } | 1751 | } |
1751 | 1752 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 54ae32a..3ca4095 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -91,18 +91,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
91 | { | 91 | { |
92 | return m_OSSL_Functions.osWindActiveModelPluginName(); | 92 | return m_OSSL_Functions.osWindActiveModelPluginName(); |
93 | } | 93 | } |
94 | 94 | ||
95 | void osWindParamSet(string plugin, string param, float value) | 95 | // Not yet plugged in as available OSSL functions, so commented out |
96 | { | 96 | // void osWindParamSet(string plugin, string param, float value) |
97 | m_OSSL_Functions.osWindParamSet(plugin, param, value); | 97 | // { |
98 | } | 98 | // m_OSSL_Functions.osWindParamSet(plugin, param, value); |
99 | 99 | // } | |
100 | float osWindParamGet(string plugin, string param) | 100 | // |
101 | { | 101 | // float osWindParamGet(string plugin, string param) |
102 | return m_OSSL_Functions.osWindParamGet(plugin, param); | 102 | // { |
103 | } | 103 | // return m_OSSL_Functions.osWindParamGet(plugin, param); |
104 | 104 | // } | |
105 | |||
106 | 105 | ||
107 | public double osList2Double(LSL_Types.list src, int index) | 106 | public double osList2Double(LSL_Types.list src, int index) |
108 | { | 107 | { |