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

* Remove mono compiler warnings 

* Leaving the 23 warnings in ChildAgentDataUpdate.cs for Diva to look at
0.6.2-post-fixes
Justin Clarke Casey 2008-12-30 20:48:31 +00:00
parent f0ea8eb534
commit e4c7bdc730
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Interfaces/IEstateModule.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Interfaces
bool IsManager(UUID avatarID); bool IsManager(UUID avatarID);
/// <summary> /// <summary>
/// Tell all clients about the current state of the region (terrain textures, water height, etc.) /// Tell all clients about the current state of the region (terrain textures, water height, etc.).
/// </summary> /// </summary>
void sendRegionHandshakeToAll(); void sendRegionHandshakeToAll();
} }

8
OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
View File

@ -191,7 +191,8 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
os.Close(); os.Close();
//m_log.InfoFormat("[REST COMMS]: Posted ChildAgentUpdate request to remote sim {0}", uri); //m_log.InfoFormat("[REST COMMS]: Posted ChildAgentUpdate request to remote sim {0}", uri);
} }
catch (WebException ex) //catch (WebException ex)
catch
{ {
//m_log.InfoFormat("[REST COMMS]: Bad send on ChildAgentUpdate {0}", ex.Message); //m_log.InfoFormat("[REST COMMS]: Bad send on ChildAgentUpdate {0}", ex.Message);
@ -200,7 +201,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
// Let's wait for the response // Let's wait for the response
//m_log.Info("[REST COMMS]: Waiting for a reply after ChildAgentUpdate"); //m_log.Info("[REST COMMS]: Waiting for a reply after ChildAgentUpdate");
string reply = null;
try try
{ {
WebResponse webResponse = ChildUpdateRequest.GetResponse(); WebResponse webResponse = ChildUpdateRequest.GetResponse();
@ -210,7 +211,8 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
} }
StreamReader sr = new StreamReader(webResponse.GetResponseStream()); StreamReader sr = new StreamReader(webResponse.GetResponseStream());
reply = sr.ReadToEnd().Trim(); //reply = sr.ReadToEnd().Trim();
sr.ReadToEnd().Trim();
sr.Close(); sr.Close();
//m_log.InfoFormat("[REST COMMS]: ChilAgentUpdate reply was {0} ", reply); //m_log.InfoFormat("[REST COMMS]: ChilAgentUpdate reply was {0} ", reply);

9
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1800,8 +1800,6 @@ namespace OpenSim.Region.Environment.Scenes
string sceneObjectXml = objectGroup.ToXmlString(); string sceneObjectXml = objectGroup.ToXmlString();
bool useOwner = false;
// Get the user info of the item destination // Get the user info of the item destination
// //
CachedUserInfo userInfo; CachedUserInfo userInfo;
@ -1849,13 +1847,8 @@ namespace OpenSim.Region.Environment.Scenes
// //
InventoryFolderBase folder = null; InventoryFolderBase folder = null;
InventoryItemBase item = null; InventoryItemBase item = null;
// No folder type needed
// We don't go here unless we have a user logged in
// so the skeleton is loaded
//
if (DeRezAction.SaveToExistingUserInventoryItem == action) if (DeRezAction.SaveToExistingUserInventoryItem == action)
{ {
item = userInfo.RootFolder.FindItem( item = userInfo.RootFolder.FindItem(

1
OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs
View File

@ -30,7 +30,6 @@ using OpenMetaverse;
using Ode.NET; using Ode.NET;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using OpenSim.Region.Physics.Manager;
using OpenSim.Region.Physics.OdePlugin; using OpenSim.Region.Physics.OdePlugin;
namespace OpenSim.Region.Physics.OdePlugin namespace OpenSim.Region.Physics.OdePlugin