aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-19 06:25:34 +0000
committerMelanie Thielker2008-11-19 06:25:34 +0000
commitf518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch)
tree8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Region/Environment/Scenes
parentReverting the texture sending patch and the new libOMV. This makes this (diff)
downloadopensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip
opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz
opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2
opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.xz
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs6
4 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 3948d31..8167c68 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -36,7 +36,7 @@ using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
38using OpenSim.Region.Interfaces; 38using OpenSim.Region.Interfaces;
39using LLSD = OpenMetaverse.StructuredData.LLSD; 39using OSD = OpenMetaverse.StructuredData.OSD;
40 40
41namespace OpenSim.Region.Environment.Scenes 41namespace OpenSim.Region.Environment.Scenes
42{ 42{
@@ -284,7 +284,7 @@ namespace OpenSim.Region.Environment.Scenes
284 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>(); 284 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
285 if (eq != null) 285 if (eq != null)
286 { 286 {
287 LLSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint); 287 OSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint);
288 eq.Enqueue(Item, avatar.UUID); 288 eq.Enqueue(Item, avatar.UUID);
289 } 289 }
290 else 290 else
@@ -698,7 +698,7 @@ namespace OpenSim.Region.Environment.Scenes
698 698
699 if (eq != null) 699 if (eq != null)
700 { 700 {
701 LLSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, reg.ExternalEndPoint, 701 OSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, reg.ExternalEndPoint,
702 4, teleportFlags, capsPath, avatar.UUID); 702 4, teleportFlags, capsPath, avatar.UUID);
703 eq.Enqueue(Item, avatar.UUID); 703 eq.Enqueue(Item, avatar.UUID);
704 } 704 }
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Environment.Scenes
748 748
749 // and set the map-tile to '(Offline)' 749 // and set the map-tile to '(Offline)'
750 uint regX, regY; 750 uint regX, regY;
751 Helpers.LongToUInts(regionHandle, out regX, out regY); 751 Utils.LongToUInts(regionHandle, out regX, out regY);
752 752
753 MapBlockData block = new MapBlockData(); 753 MapBlockData block = new MapBlockData();
754 block.X = (ushort)(regX / Constants.RegionSize); 754 block.X = (ushort)(regX / Constants.RegionSize);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 1309e77..ba638e5 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -584,11 +584,11 @@ namespace OpenSim.Region.Environment.Scenes
584 584
585 invString.AddPermissionsStart(); 585 invString.AddPermissionsStart();
586 586
587 invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(baseMask)); 587 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
588 invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(ownerMask)); 588 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
589 invString.AddNameValueLine("group_mask", Helpers.UIntToHexString(0)); 589 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0));
590 invString.AddNameValueLine("everyone_mask", Helpers.UIntToHexString(everyoneMask)); 590 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
591 invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextPermissions)); 591 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
592 592
593 invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); 593 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
594 invString.AddNameValueLine("owner_id", ownerID.ToString()); 594 invString.AddNameValueLine("owner_id", ownerID.ToString());
@@ -601,7 +601,7 @@ namespace OpenSim.Region.Environment.Scenes
601 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 601 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
602 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); 602 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
603 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); 603 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
604 invString.AddNameValueLine("flags", Helpers.UIntToHexString(item.Flags)); 604 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
605 605
606 invString.AddSaleStart(); 606 invString.AddSaleStart();
607 invString.AddNameValueLine("sale_type", "not"); 607 invString.AddNameValueLine("sale_type", "not");
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 227a941..c7862ec 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1089,9 +1089,9 @@ if (m_shape != null) {
1089 data[pos] = (byte)pTexAnim.SizeX; pos++; 1089 data[pos] = (byte)pTexAnim.SizeX; pos++;
1090 data[pos] = (byte)pTexAnim.SizeY; pos++; 1090 data[pos] = (byte)pTexAnim.SizeY; pos++;
1091 1091
1092 Helpers.FloatToBytes(pTexAnim.Start).CopyTo(data, pos); 1092 Utils.FloatToBytes(pTexAnim.Start).CopyTo(data, pos);
1093 Helpers.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4); 1093 Utils.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4);
1094 Helpers.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8); 1094 Utils.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8);
1095 1095
1096 m_TextureAnimation = data; 1096 m_TextureAnimation = data;
1097 } 1097 }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 19532e6..19f0f9c 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Types; 39using OpenSim.Region.Environment.Types;
40using OpenSim.Region.Interfaces; 40using OpenSim.Region.Interfaces;
41using OpenSim.Region.Physics.Manager; 41using OpenSim.Region.Physics.Manager;
42using LLSD = OpenMetaverse.StructuredData.LLSD; 42using OSD = OpenMetaverse.StructuredData.OSD;
43 43
44 44
45namespace OpenSim.Region.Environment.Scenes 45namespace OpenSim.Region.Environment.Scenes
@@ -2171,7 +2171,7 @@ namespace OpenSim.Region.Environment.Scenes
2171 } 2171 }
2172 2172
2173 Vector3 vel = m_velocity; 2173 Vector3 vel = m_velocity;
2174 ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); 2174 ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
2175 SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle); 2175 SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle);
2176 if (neighbourRegion != null && ValidateAttachments()) 2176 if (neighbourRegion != null && ValidateAttachments())
2177 { 2177 {
@@ -2209,7 +2209,7 @@ namespace OpenSim.Region.Environment.Scenes
2209 if (eq != null) 2209 if (eq != null)
2210 { 2210 {
2211 2211
2212 LLSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, 2212 OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
2213 capsPath, UUID, ControllingClient.SessionId); 2213 capsPath, UUID, ControllingClient.SessionId);
2214 eq.Enqueue(Item, UUID); 2214 eq.Enqueue(Item, UUID);
2215 } 2215 }