aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-16 02:56:54 +0100
committerJustin Clark-Casey (justincc)2011-07-16 02:56:54 +0100
commit2b339b7d2b1e860af2ea2a873797a70bc257bf6f (patch)
tree32475c307c1496ebf19a7889dbc97ca62754adff /OpenSim/Region/CoreModules
parentremove the need to supply SceneObjectGroup.GroupResize() with a localId. (diff)
downloadopensim-SC_OLD-2b339b7d2b1e860af2ea2a873797a70bc257bf6f.zip
opensim-SC_OLD-2b339b7d2b1e860af2ea2a873797a70bc257bf6f.tar.gz
opensim-SC_OLD-2b339b7d2b1e860af2ea2a873797a70bc257bf6f.tar.bz2
opensim-SC_OLD-2b339b7d2b1e860af2ea2a873797a70bc257bf6f.tar.xz
minor: remove mono compiler warnings
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs7
3 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
index c82cfd2..d687e6a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
196 if (!(client.Scene is Scene)) 196 if (!(client.Scene is Scene))
197 return; 197 return;
198 198
199 Scene scene = (Scene)(client.Scene); 199// Scene scene = (Scene)(client.Scene);
200 200
201 GridInstantMessage im = null; 201 GridInstantMessage im = null;
202 if (m_PendingLures.TryGetValue(lureID, out im)) 202 if (m_PendingLures.TryGetValue(lureID, out im))
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index 079e1b6..dee0ad4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
134 if (!(s is Scene)) 134 if (!(s is Scene))
135 return; 135 return;
136 136
137 Scene scene = (Scene)s; 137// Scene scene = (Scene)s;
138 138
139 string profileUrl = String.Empty; 139 string profileUrl = String.Empty;
140 string aboutText = String.Empty; 140 string aboutText = String.Empty;
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 66fbcb9..b714f2b 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -810,18 +810,20 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
810 // 810 //
811 if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment)) 811 if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
812 remoteClient.SendBulkUpdateInventory(item); 812 remoteClient.SendBulkUpdateInventory(item);
813
813 return null; 814 return null;
814 } 815 }
815 816
816 for (int i = 0 ; i < objlist.Count ; i++ ) 817 for (int i = 0 ; i < objlist.Count; i++)
817 { 818 {
818 group = objlist[i]; 819 group = objlist[i];
819 820
820 Vector3 storedPosition = group.AbsolutePosition; 821// Vector3 storedPosition = group.AbsolutePosition;
821 if (group.UUID == UUID.Zero) 822 if (group.UUID == UUID.Zero)
822 { 823 {
823 m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 3"); 824 m_log.Debug("[InventoryAccessModule]: Inventory object has UUID.Zero! Position 3");
824 } 825 }
826
825 group.RootPart.FromFolderID = item.Folder; 827 group.RootPart.FromFolderID = item.Folder;
826 828
827 // If it's rezzed in world, select it. Much easier to 829 // If it's rezzed in world, select it. Much easier to
@@ -833,6 +835,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
833 foreach (SceneObjectPart child in group.Parts) 835 foreach (SceneObjectPart child in group.Parts)
834 child.CreateSelected = true; 836 child.CreateSelected = true;
835 } 837 }
838
836 group.ResetIDs(); 839 group.ResetIDs();
837 840
838 if (attachment) 841 if (attachment)