aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorUbitUmarov2015-11-21 00:49:43 +0000
committerUbitUmarov2015-11-21 00:49:43 +0000
commit36426b0db219d005b4cba193c20c31fa8571966c (patch)
treec0fd15a36a86389cac36cf03455afc75c66a2e00 /OpenSim/Region/ClientStack/Linden
parent stop the Vehicle AFTER fixing position not before, bc stop code also updates... (diff)
downloadopensim-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 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs8
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs4
2 files changed, 3 insertions, 9 deletions
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