aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-17 21:00:34 +0000
committerJustin Clarke Casey2008-11-17 21:00:34 +0000
commitc25a0ea7923aa390d30b8eebdbca4e599edf9b0d (patch)
tree775133790681153be9edc6d640162271750a1fd0 /OpenSim/Region/Environment/Scenes
parent* minor: add interface version to 'show version' command output (diff)
downloadopensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.zip
opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.gz
opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.bz2
opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.xz
* Update libOMV to r2359. This is necessary for the progressive texture patch
* Update libopenjpeg as well for this patch. * Appears to be okay on a very short sniff test * Source code will be placed in opensim-libs shortly
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 073bccf..4209e4a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -562,11 +562,11 @@ namespace OpenSim.Region.Environment.Scenes
562 562
563 invString.AddPermissionsStart(); 563 invString.AddPermissionsStart();
564 564
565 invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(baseMask)); 565 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
566 invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(ownerMask)); 566 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
567 invString.AddNameValueLine("group_mask", Helpers.UIntToHexString(0)); 567 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0));
568 invString.AddNameValueLine("everyone_mask", Helpers.UIntToHexString(everyoneMask)); 568 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
569 invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextPermissions)); 569 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
570 570
571 invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); 571 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
572 invString.AddNameValueLine("owner_id", ownerID.ToString()); 572 invString.AddNameValueLine("owner_id", ownerID.ToString());
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Environment.Scenes
579 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 579 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
580 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); 580 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
581 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); 581 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
582 invString.AddNameValueLine("flags", Helpers.UIntToHexString(item.Flags)); 582 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
583 583
584 invString.AddSaleStart(); 584 invString.AddSaleStart();
585 invString.AddNameValueLine("sale_type", "not"); 585 invString.AddNameValueLine("sale_type", "not");
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index fa656f6..deb7f89 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 935c51b..3c51aa6 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
@@ -2170,7 +2170,7 @@ namespace OpenSim.Region.Environment.Scenes
2170 } 2170 }
2171 2171
2172 Vector3 vel = m_velocity; 2172 Vector3 vel = m_velocity;
2173 ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize)); 2173 ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
2174 SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle); 2174 SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle);
2175 if (neighbourRegion != null && ValidateAttachments()) 2175 if (neighbourRegion != null && ValidateAttachments())
2176 { 2176 {
@@ -2208,7 +2208,7 @@ namespace OpenSim.Region.Environment.Scenes
2208 if (eq != null) 2208 if (eq != null)
2209 { 2209 {
2210 2210
2211 LLSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint, 2211 OSD Item = EventQueueHelper.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.ExternalEndPoint,
2212 capsPath, UUID, ControllingClient.SessionId); 2212 capsPath, UUID, ControllingClient.SessionId);
2213 eq.Enqueue(Item, UUID); 2213 eq.Enqueue(Item, UUID);
2214 } 2214 }