diff options
author | onefang | 2019-06-04 00:50:59 +1000 |
---|---|---|
committer | onefang | 2019-06-04 00:50:59 +1000 |
commit | cdb1851f438349a8721c0d9cef54837d0b302189 (patch) | |
tree | 1a1c7255ac4343ecf44bdd5387903f467a6b7626 /OpenSim/Region/CoreModules | |
parent | Adjust [AuthorizationService] sections to use the new DefaultRegionAccess. (diff) | |
download | opensim-SC-cdb1851f438349a8721c0d9cef54837d0b302189.zip opensim-SC-cdb1851f438349a8721c0d9cef54837d0b302189.tar.gz opensim-SC-cdb1851f438349a8721c0d9cef54837d0b302189.tar.bz2 opensim-SC-cdb1851f438349a8721c0d9cef54837d0b302189.tar.xz |
Warnings--
Diffstat (limited to 'OpenSim/Region/CoreModules')
5 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 9f52a14..4afac28 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
369 | { | 369 | { |
370 | string xmlData; | 370 | string xmlData; |
371 | XmlDocument d = null; | 371 | XmlDocument d = null; |
372 | UUID asset; | 372 | // UUID asset; |
373 | if (itemData.TryGetValue(attach.ItemID, out xmlData)) | 373 | if (itemData.TryGetValue(attach.ItemID, out xmlData)) |
374 | { | 374 | { |
375 | d = new XmlDocument(); | 375 | d = new XmlDocument(); |
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index f5b575b..84b4707 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -666,7 +666,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
666 | ResponseBody = e.Message; | 666 | ResponseBody = e.Message; |
667 | } | 667 | } |
668 | } | 668 | } |
669 | catch (Exception e) | 669 | catch (Exception) |
670 | { | 670 | { |
671 | // Don't crash on anything else | 671 | // Don't crash on anything else |
672 | } | 672 | } |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 4471432..ce67fcc 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -1396,9 +1396,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1396 | byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8]; | 1396 | byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8]; |
1397 | 1397 | ||
1398 | int tempByte = 0; | 1398 | int tempByte = 0; |
1399 | int i, byteNum = 0; | 1399 | int byteNum = 0; |
1400 | int mask = 1; | 1400 | int mask = 1; |
1401 | i = 0; | ||
1402 | for (int y = 0; y < LandBitmap.GetLength(1); y++) | 1401 | for (int y = 0; y < LandBitmap.GetLength(1); y++) |
1403 | { | 1402 | { |
1404 | for (int x = 0; x < LandBitmap.GetLength(0); x++) | 1403 | for (int x = 0; x < LandBitmap.GetLength(0); x++) |
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 7b7cce8..fb94853 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -564,7 +564,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
564 | sculpt.Dispose(); | 564 | sculpt.Dispose(); |
565 | } | 565 | } |
566 | } | 566 | } |
567 | catch (Exception e) | 567 | catch /*(Exception e)*/ |
568 | { | 568 | { |
569 | Vector3 objectPos = prim.ParentGroup.RootPart.AbsolutePosition; | 569 | Vector3 objectPos = prim.ParentGroup.RootPart.AbsolutePosition; |
570 | //// TODO - print out owner of SceneObjectPart prim. | 570 | //// TODO - print out owner of SceneObjectPart prim. |
@@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
748 | using (Bitmap img = (Bitmap)imgDecoder.DecodeToImage(asset)) | 748 | using (Bitmap img = (Bitmap)imgDecoder.DecodeToImage(asset)) |
749 | ret = new warp_Texture(img); | 749 | ret = new warp_Texture(img); |
750 | } | 750 | } |
751 | catch (Exception e) | 751 | catch /*(Exception e)*/ |
752 | { | 752 | { |
753 | m_log.Debug(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception ", id)); | 753 | m_log.Debug(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception ", id)); |
754 | } | 754 | } |
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index b1eb0a5..96ba003 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules | |||
47 | 47 | ||
48 | private uint m_frame = 0; | 48 | private uint m_frame = 0; |
49 | private int m_dataVersion = 0; | 49 | private int m_dataVersion = 0; |
50 | private int m_regionID = 0; | 50 | // private int m_regionID = 0; |
51 | private int m_frameUpdateRate = 150; | 51 | private int m_frameUpdateRate = 150; |
52 | //private Random m_rndnums = new Random(Environment.TickCount); | 52 | //private Random m_rndnums = new Random(Environment.TickCount); |
53 | private Scene m_scene = null; | 53 | private Scene m_scene = null; |