diff options
author | Justin Clark-Casey (justincc) | 2011-01-21 23:19:44 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-01-21 23:19:52 +0000 |
commit | 41105948bdb21d8f53ad3aeeb8cfdddb8aa7367c (patch) | |
tree | d77d878eeb596456bfe6f4629320882f4abb5bdf /OpenSim/Region/CoreModules/World | |
parent | make "show info" and "show version" show the same version text (diff) | |
download | opensim-SC-41105948bdb21d8f53ad3aeeb8cfdddb8aa7367c.zip opensim-SC-41105948bdb21d8f53ad3aeeb8cfdddb8aa7367c.tar.gz opensim-SC-41105948bdb21d8f53ad3aeeb8cfdddb8aa7367c.tar.bz2 opensim-SC-41105948bdb21d8f53ad3aeeb8cfdddb8aa7367c.tar.xz |
remove some mono compiler warnings
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index ddae20f..b0563c5 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -767,6 +767,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
767 | LookupUUIDS icon = (LookupUUIDS)iar.AsyncState; | 767 | LookupUUIDS icon = (LookupUUIDS)iar.AsyncState; |
768 | icon.EndInvoke(iar); | 768 | icon.EndInvoke(iar); |
769 | } | 769 | } |
770 | |||
770 | private void LookupUUID(List<UUID> uuidLst) | 771 | private void LookupUUID(List<UUID> uuidLst) |
771 | { | 772 | { |
772 | LookupUUIDS d = LookupUUIDsAsync; | 773 | LookupUUIDS d = LookupUUIDsAsync; |
@@ -775,6 +776,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
775 | LookupUUIDSCompleted, | 776 | LookupUUIDSCompleted, |
776 | d); | 777 | d); |
777 | } | 778 | } |
779 | |||
778 | private void LookupUUIDsAsync(List<UUID> uuidLst) | 780 | private void LookupUUIDsAsync(List<UUID> uuidLst) |
779 | { | 781 | { |
780 | UUID[] uuidarr; | 782 | UUID[] uuidarr; |
@@ -789,12 +791,12 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
789 | // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); | 791 | // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); |
790 | 792 | ||
791 | IUserManagement userManager = m_scene.RequestModuleInterface<IUserManagement>(); | 793 | IUserManagement userManager = m_scene.RequestModuleInterface<IUserManagement>(); |
792 | string userName = "Unkown User"; | ||
793 | if (userManager != null) | 794 | if (userManager != null) |
794 | userName = userManager.GetUserName(uuidarr[i]); | 795 | userManager.GetUserName(uuidarr[i]); |
795 | 796 | ||
796 | // we drop it. It gets cached though... so we're ready for the next request. | 797 | // we drop it. It gets cached though... so we're ready for the next request. |
797 | // diva commnent 11/21/2010: uh?!? wft? | 798 | // diva commnent 11/21/2010: uh?!? wft? |
799 | // justincc comment 21/01/2011: A side effect of userManager.GetUserName() I presume. | ||
798 | } | 800 | } |
799 | } | 801 | } |
800 | #endregion | 802 | #endregion |
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 8df44fe..09c0ebb 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.CoreModules.World.Sound | |||
38 | { | 38 | { |
39 | public class SoundModule : IRegionModule, ISoundModule | 39 | public class SoundModule : IRegionModule, ISoundModule |
40 | { | 40 | { |
41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | protected Scene m_scene; | 43 | protected Scene m_scene; |
44 | 44 | ||
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs index af59d7a..522a7eb 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs | |||
@@ -85,9 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
85 | public static float noise1(float arg) | 85 | public static float noise1(float arg) |
86 | { | 86 | { |
87 | int bx0, bx1; | 87 | int bx0, bx1; |
88 | float rx0, rx1, sx, t, u, v, a; | 88 | float rx0, rx1, sx, t, u, v; |
89 | |||
90 | a = arg; | ||
91 | 89 | ||
92 | t = arg + N; | 90 | t = arg + N; |
93 | bx0 = ((int)t) & BM; | 91 | bx0 = ((int)t) & BM; |