OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: remove some mono compiler warnings

0.6.5-rc1
Justin Clarke Casey 2009-04-07 20:24:09 +00:00
parent 41fab69ad5
commit ad7b005784
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Grid/InventoryServer/Main.cs
View File

@ -44,7 +44,7 @@ namespace OpenSim.Grid.InventoryServer
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private GridInventoryService m_inventoryService; private GridInventoryService m_inventoryService;
private HGInventoryService m_directInventoryService; //private HGInventoryService m_directInventoryService;
public const string LogName = "INVENTORY"; public const string LogName = "INVENTORY";
@ -83,7 +83,7 @@ namespace OpenSim.Grid.InventoryServer
m_log.Info("[" + LogName + "]: Started HTTP server"); m_log.Info("[" + LogName + "]: Started HTTP server");
m_directInventoryService = new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL); //m_directInventoryService = new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL);
base.StartupSpecific(); base.StartupSpecific();

2
OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
View File

@ -654,7 +654,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
if (args["itemid"] != null) if (args["itemid"] != null)
itemID = args["itemid"].AsUUID(); itemID = args["itemid"].AsUUID();
UUID regionID = m_localBackend.GetRegionID(regionhandle); //UUID regionID = m_localBackend.GetRegionID(regionhandle);
// This is the meaning of PUT object // This is the meaning of PUT object
bool result = m_localBackend.SendCreateObject(regionhandle, userID, itemID); bool result = m_localBackend.SendCreateObject(regionhandle, userID, itemID);

4
OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
View File

@ -37,8 +37,8 @@ namespace OpenSim.Region.CoreModules
{ {
public class CloudModule : ICloudModule public class CloudModule : ICloudModule
{ {
private static readonly log4net.ILog m_log // private static readonly log4net.ILog m_log
= log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private Random m_rndnums = new Random(Environment.TickCount); private Random m_rndnums = new Random(Environment.TickCount);
private Scene m_scene = null; private Scene m_scene = null;

2
OpenSim/Region/CoreModules/World/Wind/WindModule.cs
View File

@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules
private uint m_frame = 0; private uint m_frame = 0;
private uint m_frameLastUpdateClientArray = 0; private uint m_frameLastUpdateClientArray = 0;
private int m_frameUpdateRate = 150; private int m_frameUpdateRate = 150;
private Random m_rndnums = new Random(Environment.TickCount); //private Random m_rndnums = new Random(Environment.TickCount);
private Scene m_scene = null; private Scene m_scene = null;
private bool m_ready = false; private bool m_ready = false;

3
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1744,8 +1744,9 @@ namespace OpenSim.Region.Framework.Scenes
if (sp != null) if (sp != null)
{ {
uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID); uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID);
SceneObjectGroup sog = m_sceneGraph.RezSingleAttachment(sp.ControllingClient, itemID, attPt); m_sceneGraph.RezSingleAttachment(sp.ControllingClient, itemID, attPt);
} }
return false; return false;
} }

23
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -91,18 +91,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{ {
return m_OSSL_Functions.osWindActiveModelPluginName(); return m_OSSL_Functions.osWindActiveModelPluginName();
} }
void osWindParamSet(string plugin, string param, float value) // Not yet plugged in as available OSSL functions, so commented out
{ // void osWindParamSet(string plugin, string param, float value)
m_OSSL_Functions.osWindParamSet(plugin, param, value); // {
} // m_OSSL_Functions.osWindParamSet(plugin, param, value);
// }
float osWindParamGet(string plugin, string param) //
{ // float osWindParamGet(string plugin, string param)
return m_OSSL_Functions.osWindParamGet(plugin, param); // {
} // return m_OSSL_Functions.osWindParamGet(plugin, param);
// }
public double osList2Double(LSL_Types.list src, int index) public double osList2Double(LSL_Types.list src, int index)
{ {