aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs20
8 files changed, 31 insertions, 25 deletions
diff --git a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
index c828ef0..725322b 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -122,7 +122,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL
122 { 122 {
123 WebRequest request = HttpWebRequest.Create(url); 123 WebRequest request = HttpWebRequest.Create(url);
124 RequestState state = new RequestState((HttpWebRequest) request, requestID); 124 RequestState state = new RequestState((HttpWebRequest) request, requestID);
125 IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state); 125 // IAsyncResult result = request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state);
126 request.BeginGetResponse(new AsyncCallback(HttpRequestReturn), state);
126 127
127 TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1)); 128 TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1));
128 state.TimeOfRequest = (int) t.TotalSeconds; 129 state.TimeOfRequest = (int) t.TotalSeconds;
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index b6d2ab4..3f8cc0b 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -500,7 +500,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
500 500
501 for (int i = 0; i < uuidarr.Length; i++) 501 for (int i = 0; i < uuidarr.Length; i++)
502 { 502 {
503 string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); 503 // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
504 m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
504 // we drop it. It gets cached though... so we're ready for the next request. 505 // we drop it. It gets cached though... so we're ready for the next request.
505 } 506 }
506 } 507 }
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index e8defb7..d6ee739 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
310 objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify; 310 objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify;
311 311
312 // Customize the GroupMask 312 // Customize the GroupMask
313 uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); 313 // uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags);
314 314
315 // Customize the EveryoneMask 315 // Customize the EveryoneMask
316 uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags); 316 uint objectEveryoneMask = ApplyObjectModifyMasks(task.EveryoneMask, objflags);
@@ -655,10 +655,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
655 SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; 655 SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
656 656
657 657
658 LLUUID taskOwner = null; 658 // LLUUID taskOwner = null;
659 // Added this because at this point in time it wouldn't be wise for 659 // Added this because at this point in time it wouldn't be wise for
660 // the administrator object permissions to take effect. 660 // the administrator object permissions to take effect.
661 LLUUID objectOwner = task.OwnerID; 661 // LLUUID objectOwner = task.OwnerID;
662 662
663 // Anyone can move 663 // Anyone can move
664 if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0) 664 if ((task.RootPart.EveryoneMask & PERM_MOVE) != 0)
@@ -842,10 +842,10 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
842 } 842 }
843 843
844 SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; 844 SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID];
845 LLUUID taskOwner = null; 845 // LLUUID taskOwner = null;
846 // Added this because at this point in time it wouldn't be wise for 846 // Added this because at this point in time it wouldn't be wise for
847 // the administrator object permissions to take effect. 847 // the administrator object permissions to take effect.
848 LLUUID objectOwner = task.OwnerID; 848 // LLUUID objectOwner = task.OwnerID;
849 849
850 850
851 if ((task.RootPart.EveryoneMask & PERM_COPY) != 0) 851 if ((task.RootPart.EveryoneMask & PERM_COPY) != 0)
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
index 01f6301..28f3996 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs
@@ -177,7 +177,8 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
177 { 177 {
178 if (region.RegionInfo.RegionName == (string) args[0]) 178 if (region.RegionInfo.RegionName == (string) args[0])
179 { 179 {
180 List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); 180 // List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
181 SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
181 } 182 }
182 } 183 }
183 } 184 }
@@ -186,7 +187,8 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
186 { 187 {
187 foreach (Scene region in m_regions) 188 foreach (Scene region in m_regions)
188 { 189 {
189 List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/"); 190 // List<string> results = SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
191 SerialiseRegion(region, m_savedir + region.RegionInfo.RegionID.ToString() + "/");
190 } 192 }
191 } 193 }
192 194
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index ab0ed6b..fd8e2f8 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1096,7 +1096,7 @@ namespace OpenSim.Region.Environment.Scenes
1096 SceneObjectGroup group = GetGroupByPrim(localID); 1096 SceneObjectGroup group = GetGroupByPrim(localID);
1097 if (group != null) 1097 if (group != null)
1098 { 1098 {
1099 LLVector3 oldPos = group.AbsolutePosition; 1099 // LLVector3 oldPos = group.AbsolutePosition;
1100 if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment) 1100 if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment)
1101 { 1101 {
1102 group.SendGroupTerseUpdate(); 1102 group.SendGroupTerseUpdate();
@@ -1122,7 +1122,7 @@ namespace OpenSim.Region.Environment.Scenes
1122 if (group != null) 1122 if (group != null)
1123 { 1123 {
1124 1124
1125 LLVector3 oldPos = group.AbsolutePosition; 1125 // LLVector3 oldPos = group.AbsolutePosition;
1126 if (group.RootPart.m_IsAttachment) 1126 if (group.RootPart.m_IsAttachment)
1127 { 1127 {
1128 group.UpdateGroupPosition(pos); 1128 group.UpdateGroupPosition(pos);
@@ -1467,7 +1467,8 @@ namespace OpenSim.Region.Environment.Scenes
1467 { 1467 {
1468 //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); 1468 //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID);
1469 1469
1470 SceneObjectGroup dupe = DuplicateObject(originalPrim, offset, flags, AgentID, GroupID, Quaternion.Zero); 1470 // SceneObjectGroup dupe = DuplicateObject(originalPrim, offset, flags, AgentID, GroupID, Quaternion.Zero);
1471 DuplicateObject(originalPrim, offset, flags, AgentID, GroupID, Quaternion.Zero);
1471 } 1472 }
1472 /// <summary> 1473 /// <summary>
1473 /// Duplicate the given object. 1474 /// Duplicate the given object.
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a5805af..3879b57 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2098,7 +2098,8 @@ namespace OpenSim.Region.Environment.Scenes
2098 { 2098 {
2099 LLQuaternion worldRot = target2.GetWorldRotation(); 2099 LLQuaternion worldRot = target2.GetWorldRotation();
2100 2100
2101 SceneObjectGroup obj = m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, new Quaternion(worldRot.W,worldRot.X,worldRot.Y,worldRot.Z)); 2101 // SceneObjectGroup obj = m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, new Quaternion(worldRot.W,worldRot.X,worldRot.Y,worldRot.Z));
2102 m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID, new Quaternion(worldRot.W,worldRot.X,worldRot.Y,worldRot.Z));
2102 //obj.Rotation = new Quaternion(worldRot.W, worldRot.X, worldRot.Y, worldRot.Z); 2103 //obj.Rotation = new Quaternion(worldRot.W, worldRot.X, worldRot.Y, worldRot.Z);
2103 //obj.UpdateGroupRotation(worldRot); 2104 //obj.UpdateGroupRotation(worldRot);
2104 } 2105 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 6e14577..cdd138b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -266,8 +266,8 @@ namespace OpenSim.Region.Environment.Scenes
266 266
267 public void RequestNeighbors(RegionInfo region) 267 public void RequestNeighbors(RegionInfo region)
268 { 268 {
269 List<SimpleRegionInfo> neighbours = 269 // List<SimpleRegionInfo> neighbours =
270 m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); 270 m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
271 //IPEndPoint blah = new IPEndPoint(); 271 //IPEndPoint blah = new IPEndPoint();
272 272
273 //blah.Address = region.RemotingAddress; 273 //blah.Address = region.RemotingAddress;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index d7aa962..b610477 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -823,7 +823,7 @@ namespace OpenSim.Region.Environment.Scenes
823 823
824 public void AddFlag(LLObject.ObjectFlags flag) 824 public void AddFlag(LLObject.ObjectFlags flag)
825 { 825 {
826 LLObject.ObjectFlags prevflag = Flags; 826 // LLObject.ObjectFlags prevflag = Flags;
827 //uint objflags = Flags; 827 //uint objflags = Flags;
828 if ((ObjectFlags & (uint) flag) == 0) 828 if ((ObjectFlags & (uint) flag) == 0)
829 { 829 {
@@ -1678,7 +1678,7 @@ namespace OpenSim.Region.Environment.Scenes
1678 1678
1679 public void PreloadSound(string sound) 1679 public void PreloadSound(string sound)
1680 { 1680 {
1681 LLUUID ownerID = OwnerID; 1681 // LLUUID ownerID = OwnerID;
1682 LLUUID objectID = UUID; 1682 LLUUID objectID = UUID;
1683 LLUUID soundID = LLUUID.Zero; 1683 LLUUID soundID = LLUUID.Zero;
1684 1684
@@ -1708,7 +1708,7 @@ namespace OpenSim.Region.Environment.Scenes
1708 1708
1709 public void RemFlag(LLObject.ObjectFlags flag) 1709 public void RemFlag(LLObject.ObjectFlags flag)
1710 { 1710 {
1711 LLObject.ObjectFlags prevflag = Flags; 1711 // LLObject.ObjectFlags prevflag = Flags;
1712 if ((ObjectFlags & (uint) flag) != 0) 1712 if ((ObjectFlags & (uint) flag) != 0)
1713 { 1713 {
1714 //Console.WriteLine("Removing flag: " + ((LLObject.ObjectFlags)flag).ToString()); 1714 //Console.WriteLine("Removing flag: " + ((LLObject.ObjectFlags)flag).ToString());
@@ -2153,12 +2153,12 @@ namespace OpenSim.Region.Environment.Scenes
2153 2153
2154 public void SetScriptEvents(LLUUID scriptid, int events) 2154 public void SetScriptEvents(LLUUID scriptid, int events)
2155 { 2155 {
2156 scriptEvents oldparts; 2156 // scriptEvents oldparts;
2157 lock (m_scriptEvents) 2157 lock (m_scriptEvents)
2158 { 2158 {
2159 if (m_scriptEvents.ContainsKey(scriptid)) 2159 if (m_scriptEvents.ContainsKey(scriptid))
2160 { 2160 {
2161 oldparts = m_scriptEvents[scriptid]; 2161 // oldparts = m_scriptEvents[scriptid];
2162 2162
2163 // remove values from aggregated script events 2163 // remove values from aggregated script events
2164 m_scriptEvents[scriptid] = (scriptEvents) events; 2164 m_scriptEvents[scriptid] = (scriptEvents) events;
@@ -2259,8 +2259,8 @@ namespace OpenSim.Region.Environment.Scenes
2259 Vector3 vAbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z); 2259 Vector3 vAbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
2260 2260
2261 Vector3 vScale = new Vector3(Scale.X, Scale.Y, Scale.Z); 2261 Vector3 vScale = new Vector3(Scale.X, Scale.Y, Scale.Z);
2262 Quaternion qRotation = 2262 // Quaternion qRotation =
2263 new Quaternion(RotationOffset.W, RotationOffset.X, RotationOffset.Y, RotationOffset.Z); 2263 // new Quaternion(RotationOffset.W, RotationOffset.X, RotationOffset.Y, RotationOffset.Z);
2264 2264
2265 2265
2266 //Quaternion worldRotation = (qRotation*parentrot); 2266 //Quaternion worldRotation = (qRotation*parentrot);
@@ -2366,7 +2366,7 @@ namespace OpenSim.Region.Environment.Scenes
2366 // TODO: Change to take shape into account 2366 // TODO: Change to take shape into account
2367 Vector3[] vertexes = new Vector3[8]; 2367 Vector3[] vertexes = new Vector3[8];
2368 2368
2369 float[] distance = new float[6]; 2369 // float[] distance = new float[6];
2370 Vector3[] FaceA = new Vector3[6]; // vertex A for Facei 2370 Vector3[] FaceA = new Vector3[6]; // vertex A for Facei
2371 Vector3[] FaceB = new Vector3[6]; // vertex B for Facei 2371 Vector3[] FaceB = new Vector3[6]; // vertex B for Facei
2372 Vector3[] FaceC = new Vector3[6]; // vertex C for Facei 2372 Vector3[] FaceC = new Vector3[6]; // vertex C for Facei
@@ -2830,7 +2830,7 @@ namespace OpenSim.Region.Environment.Scenes
2830 bool usePhysics = false; 2830 bool usePhysics = false;
2831 bool IsTemporary = false; 2831 bool IsTemporary = false;
2832 bool IsPhantom = false; 2832 bool IsPhantom = false;
2833 bool castsShadows = false; 2833 // bool castsShadows = false;
2834 bool wasUsingPhysics = ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) != 0); 2834 bool wasUsingPhysics = ((ObjectFlags & (uint) LLObject.ObjectFlags.Physics) != 0);
2835 //bool IsLocked = false; 2835 //bool IsLocked = false;
2836 int i = 0; 2836 int i = 0;
@@ -2843,7 +2843,7 @@ namespace OpenSim.Region.Environment.Scenes
2843 //System.Console.WriteLine("U" + packet.ToBytes().Length.ToString()); 2843 //System.Console.WriteLine("U" + packet.ToBytes().Length.ToString());
2844 IsTemporary = (data[i++] != 0) ? true : false; 2844 IsTemporary = (data[i++] != 0) ? true : false;
2845 IsPhantom = (data[i++] != 0) ? true : false; 2845 IsPhantom = (data[i++] != 0) ? true : false;
2846 castsShadows = (data[i++] != 0) ? true : false; 2846 // castsShadows = (data[i++] != 0) ? true : false;
2847 } 2847 }
2848 catch (Exception) 2848 catch (Exception)
2849 { 2849 {