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

remove some compile warnings increasing total number by 2

LSLKeyTest
UbitUmarov 2015-11-21 00:49:43 +00:00
parent 019d057563
commit 36426b0db2
6 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
View File

@ -55,11 +55,7 @@ namespace OpenSim.Capabilities.Handlers
private IAssetService m_assetService; private IAssetService m_assetService;
public const string DefaultFormat = "x-j2c"; public const string DefaultFormat = "x-j2c";
// TODO: Change this to a config option
private string m_RedirectURL = null;
public GetTextureHandler(IAssetService assService) public GetTextureHandler(IAssetService assService)
{ {
m_assetService = assService; m_assetService = assService;

8
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
View File

@ -350,7 +350,7 @@ namespace OpenSim.Region.ClientStack.Linden
else else
return false; return false;
} }
catch (Exception e) catch
{ {
return false; return false;
} }
@ -550,14 +550,12 @@ namespace OpenSim.Region.ClientStack.Linden
} }
} }
} }
catch (Exception e) catch
{ {
return false; return false;
} }
OSDArray decodedMeshOsdArray = null; OSDArray decodedMeshOsdArray = null;
if ((!decodedMeshOsd is OSDArray))
return false;
byte[] dummy; byte[] dummy;
@ -618,7 +616,7 @@ namespace OpenSim.Region.ClientStack.Linden
} }
} }
} }
catch (Exception e) catch
{ {
return false; return false;
} }

4
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
View File

@ -82,10 +82,6 @@ namespace OpenSim.Region.ClientStack.Linden
private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue =
new OpenMetaverse.BlockingQueue<aPollRequest>(); new OpenMetaverse.BlockingQueue<aPollRequest>();
// TODO: Change this to a config option
private string m_RedirectURL = null;
private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();

2
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
View File

@ -49,8 +49,6 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
using OSDArray = OpenMetaverse.StructuredData.OSDArray; using OSDArray = OpenMetaverse.StructuredData.OSDArray;
using OSDMap = OpenMetaverse.StructuredData.OSDMap; using OSDMap = OpenMetaverse.StructuredData.OSDMap;
using Mono.Addins;
namespace OpenSim.Region.CoreModules.Avatar.Gods namespace OpenSim.Region.CoreModules.Avatar.Gods
{ {
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")] [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")]

2
OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
View File

@ -1290,7 +1290,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
m_eventsubscription = 0; m_eventsubscription = 0;
} }
internal void AddCollisionEvent(uint CollidedWith, ContactPoint contact) public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
{ {
if (m_eventsubscription > 0) if (m_eventsubscription > 0)
{ {

2
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
View File

@ -3124,7 +3124,7 @@ Console.WriteLine(" JointCreateFixed");
m_eventsubscription = 0; m_eventsubscription = 0;
} }
public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
{ {
CollisionEventsThisFrame.AddCollider(CollidedWith, contact); CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
} }