diff options
author | UbitUmarov | 2015-11-21 00:49:43 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-21 00:49:43 +0000 |
commit | 36426b0db219d005b4cba193c20c31fa8571966c (patch) | |
tree | c0fd15a36a86389cac36cf03455afc75c66a2e00 /OpenSim | |
parent | stop the Vehicle AFTER fixing position not before, bc stop code also updates... (diff) | |
download | opensim-SC-36426b0db219d005b4cba193c20c31fa8571966c.zip opensim-SC-36426b0db219d005b4cba193c20c31fa8571966c.tar.gz opensim-SC-36426b0db219d005b4cba193c20c31fa8571966c.tar.bz2 opensim-SC-36426b0db219d005b4cba193c20c31fa8571966c.tar.xz |
remove some compile warnings increasing total number by 2
Diffstat (limited to '')
6 files changed, 6 insertions, 18 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs index 59d8b9a..ac99692 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | |||
@@ -55,11 +55,7 @@ namespace OpenSim.Capabilities.Handlers | |||
55 | private IAssetService m_assetService; | 55 | private IAssetService m_assetService; |
56 | 56 | ||
57 | public const string DefaultFormat = "x-j2c"; | 57 | public const string DefaultFormat = "x-j2c"; |
58 | 58 | ||
59 | // TODO: Change this to a config option | ||
60 | private string m_RedirectURL = null; | ||
61 | |||
62 | |||
63 | public GetTextureHandler(IAssetService assService) | 59 | public GetTextureHandler(IAssetService assService) |
64 | { | 60 | { |
65 | m_assetService = assService; | 61 | m_assetService = assService; |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs index f6a950f..be66ae5 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | |||
@@ -350,7 +350,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
350 | else | 350 | else |
351 | return false; | 351 | return false; |
352 | } | 352 | } |
353 | catch (Exception e) | 353 | catch |
354 | { | 354 | { |
355 | return false; | 355 | return false; |
356 | } | 356 | } |
@@ -550,14 +550,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
550 | } | 550 | } |
551 | } | 551 | } |
552 | } | 552 | } |
553 | catch (Exception e) | 553 | catch |
554 | { | 554 | { |
555 | return false; | 555 | return false; |
556 | } | 556 | } |
557 | 557 | ||
558 | OSDArray decodedMeshOsdArray = null; | 558 | OSDArray decodedMeshOsdArray = null; |
559 | if ((!decodedMeshOsd is OSDArray)) | ||
560 | return false; | ||
561 | 559 | ||
562 | byte[] dummy; | 560 | byte[] dummy; |
563 | 561 | ||
@@ -618,7 +616,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
618 | } | 616 | } |
619 | } | 617 | } |
620 | } | 618 | } |
621 | catch (Exception e) | 619 | catch |
622 | { | 620 | { |
623 | return false; | 621 | return false; |
624 | } | 622 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index 79a3458..aa51a00 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
@@ -82,10 +82,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
82 | private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = | 82 | private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue = |
83 | new OpenMetaverse.BlockingQueue<aPollRequest>(); | 83 | new OpenMetaverse.BlockingQueue<aPollRequest>(); |
84 | 84 | ||
85 | |||
86 | // TODO: Change this to a config option | ||
87 | private string m_RedirectURL = null; | ||
88 | |||
89 | private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); | 85 | private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); |
90 | 86 | ||
91 | 87 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index adb838c..e0c4924 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
@@ -49,8 +49,6 @@ using Caps = OpenSim.Framework.Capabilities.Caps; | |||
49 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | 49 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; |
50 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | 50 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; |
51 | 51 | ||
52 | using Mono.Addins; | ||
53 | |||
54 | namespace OpenSim.Region.CoreModules.Avatar.Gods | 52 | namespace OpenSim.Region.CoreModules.Avatar.Gods |
55 | { | 53 | { |
56 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")] | 54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")] |
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs index 4c9df9c..f535c41 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs | |||
@@ -1290,7 +1290,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
1290 | m_eventsubscription = 0; | 1290 | m_eventsubscription = 0; |
1291 | } | 1291 | } |
1292 | 1292 | ||
1293 | internal void AddCollisionEvent(uint CollidedWith, ContactPoint contact) | 1293 | public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact) |
1294 | { | 1294 | { |
1295 | if (m_eventsubscription > 0) | 1295 | if (m_eventsubscription > 0) |
1296 | { | 1296 | { |
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs index ac082cb..8f2215a 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs | |||
@@ -3124,7 +3124,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
3124 | m_eventsubscription = 0; | 3124 | m_eventsubscription = 0; |
3125 | } | 3125 | } |
3126 | 3126 | ||
3127 | public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) | 3127 | public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact) |
3128 | { | 3128 | { |
3129 | CollisionEventsThisFrame.AddCollider(CollidedWith, contact); | 3129 | CollisionEventsThisFrame.AddCollider(CollidedWith, contact); |
3130 | } | 3130 | } |