diff options
author | Jeff Ames | 2007-12-20 05:43:02 +0000 |
---|---|---|
committer | Jeff Ames | 2007-12-20 05:43:02 +0000 |
commit | be2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch) | |
tree | 688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Region/Environment/Scenes | |
parent | *Added event called after any movement is handled (OnClientMovement) - will b... (diff) | |
download | opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2 opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.xz |
Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 22 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
4 files changed, 19 insertions, 22 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 9821906..753d0cf 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -241,7 +241,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
241 | { | 241 | { |
242 | MainLog.Instance.Verbose( | 242 | MainLog.Instance.Verbose( |
243 | "INVENTORY", | 243 | "INVENTORY", |
244 | "Moving item for " + remoteClient.AgentId.ToStringHyphenated()); | 244 | "Moving item for " + remoteClient.AgentId.ToString()); |
245 | 245 | ||
246 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); | 246 | CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); |
247 | if (userInfo == null) | 247 | if (userInfo == null) |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 474d8d5..01d6c5a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
88 | protected SceneCommunicationService m_sceneGridService; | 88 | protected SceneCommunicationService m_sceneGridService; |
89 | protected SceneXmlLoader m_sceneXmlLoader; | 89 | protected SceneXmlLoader m_sceneXmlLoader; |
90 | 90 | ||
91 | protected Dictionary<LLUUID, Caps> m_capsHandlers = new Dictionary<LLUUID, Caps>(); | 91 | protected Dictionary<LLUUID, OpenSim.Region.Capabilities.Caps> m_capsHandlers = new Dictionary<LLUUID, OpenSim.Region.Capabilities.Caps>(); |
92 | protected BaseHttpServer httpListener; | 92 | protected BaseHttpServer httpListener; |
93 | 93 | ||
94 | protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>(); | 94 | protected Dictionary<string, IRegionModule> Modules = new Dictionary<string, IRegionModule>(); |
@@ -990,6 +990,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
990 | } | 990 | } |
991 | } | 991 | } |
992 | 992 | ||
993 | /* Tree has been removed from libSL | ||
993 | public void AddTree(LLVector3 scale, LLQuaternion rotation, LLVector3 position, | 994 | public void AddTree(LLVector3 scale, LLQuaternion rotation, LLVector3 position, |
994 | libsecondlife.ObjectManager.Tree treeType, bool newTree) | 995 | libsecondlife.ObjectManager.Tree treeType, bool newTree) |
995 | { | 996 | { |
@@ -1001,7 +1002,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1001 | treeShape.State = (byte)treeType; | 1002 | treeShape.State = (byte)treeType; |
1002 | AddNewPrim(LLUUID.Random(), position, rotation, treeShape); | 1003 | AddNewPrim(LLUUID.Random(), position, rotation, treeShape); |
1003 | } | 1004 | } |
1004 | 1005 | */ | |
1005 | public void RemovePrim(uint localID, LLUUID avatar_deleter) | 1006 | public void RemovePrim(uint localID, LLUUID avatar_deleter) |
1006 | { | 1007 | { |
1007 | m_innerScene.RemovePrim(localID, avatar_deleter); | 1008 | m_innerScene.RemovePrim(localID, avatar_deleter); |
@@ -1323,8 +1324,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1323 | { | 1324 | { |
1324 | if (agent.CapsPath != "") | 1325 | if (agent.CapsPath != "") |
1325 | { | 1326 | { |
1326 | Caps cap = | 1327 | OpenSim.Region.Capabilities.Caps cap = |
1327 | new Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, | 1328 | new OpenSim.Region.Capabilities.Caps(AssetCache, httpListener, m_regInfo.ExternalHostName, httpListener.Port, |
1328 | agent.CapsPath, agent.AgentID, m_dumpAssetsToFile); | 1329 | agent.CapsPath, agent.AgentID, m_dumpAssetsToFile); |
1329 | 1330 | ||
1330 | Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + | 1331 | Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + |
@@ -1335,7 +1336,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1335 | if (m_capsHandlers.ContainsKey(agent.AgentID)) | 1336 | if (m_capsHandlers.ContainsKey(agent.AgentID)) |
1336 | { | 1337 | { |
1337 | //MainLog.Instance.Warn("client", "Adding duplicate CAPS entry for user " + | 1338 | //MainLog.Instance.Warn("client", "Adding duplicate CAPS entry for user " + |
1338 | // agent.AgentID.ToStringHyphenated()); | 1339 | // agent.AgentID.ToString()); |
1339 | try | 1340 | try |
1340 | { | 1341 | { |
1341 | m_capsHandlers[agent.AgentID] = cap; | 1342 | m_capsHandlers[agent.AgentID] = cap; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 5e5b8b5..f3be4bd 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1030,8 +1030,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1030 | foreach (TaskInventoryItem item in TaskInventory.Values) | 1030 | foreach (TaskInventoryItem item in TaskInventory.Values) |
1031 | { | 1031 | { |
1032 | invString.AddItemStart(); | 1032 | invString.AddItemStart(); |
1033 | invString.AddNameValueLine("item_id", item.item_id.ToStringHyphenated()); | 1033 | invString.AddNameValueLine("item_id", item.item_id.ToString()); |
1034 | invString.AddNameValueLine("parent_id", item.parent_id.ToStringHyphenated()); | 1034 | invString.AddNameValueLine("parent_id", item.parent_id.ToString()); |
1035 | 1035 | ||
1036 | invString.AddPermissionsStart(); | 1036 | invString.AddPermissionsStart(); |
1037 | invString.AddNameValueLine("base_mask", "0x7FFFFFFF"); | 1037 | invString.AddNameValueLine("base_mask", "0x7FFFFFFF"); |
@@ -1039,13 +1039,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
1039 | invString.AddNameValueLine("group_mask", "0x7FFFFFFF"); | 1039 | invString.AddNameValueLine("group_mask", "0x7FFFFFFF"); |
1040 | invString.AddNameValueLine("everyone_mask", "0x7FFFFFFF"); | 1040 | invString.AddNameValueLine("everyone_mask", "0x7FFFFFFF"); |
1041 | invString.AddNameValueLine("next_owner_mask", "0x7FFFFFFF"); | 1041 | invString.AddNameValueLine("next_owner_mask", "0x7FFFFFFF"); |
1042 | invString.AddNameValueLine("creator_id", item.creator_id.ToStringHyphenated()); | 1042 | invString.AddNameValueLine("creator_id", item.creator_id.ToString()); |
1043 | invString.AddNameValueLine("owner_id", item.owner_id.ToStringHyphenated()); | 1043 | invString.AddNameValueLine("owner_id", item.owner_id.ToString()); |
1044 | invString.AddNameValueLine("last_owner_id", item.last_owner_id.ToStringHyphenated()); | 1044 | invString.AddNameValueLine("last_owner_id", item.last_owner_id.ToString()); |
1045 | invString.AddNameValueLine("group_id", item.group_id.ToStringHyphenated()); | 1045 | invString.AddNameValueLine("group_id", item.group_id.ToString()); |
1046 | invString.AddSectionEnd(); | 1046 | invString.AddSectionEnd(); |
1047 | 1047 | ||
1048 | invString.AddNameValueLine("asset_id", item.asset_id.ToStringHyphenated()); | 1048 | invString.AddNameValueLine("asset_id", item.asset_id.ToString()); |
1049 | invString.AddNameValueLine("type", item.type); | 1049 | invString.AddNameValueLine("type", item.type); |
1050 | invString.AddNameValueLine("inv_type", item.inv_type); | 1050 | invString.AddNameValueLine("inv_type", item.inv_type); |
1051 | invString.AddNameValueLine("flags", "0x00"); | 1051 | invString.AddNameValueLine("flags", "0x00"); |
@@ -1255,12 +1255,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1255 | tex.FaceTextures[i].RGBA = tmpcolor; | 1255 | tex.FaceTextures[i].RGBA = tmpcolor; |
1256 | } | 1256 | } |
1257 | } | 1257 | } |
1258 | tmpcolor = tex.DefaultTexture.RGBA; | 1258 | tmpcolor = tex.FaceTextures[0].RGBA; |
1259 | tmpcolor.A = tmpcolor.A * 255; | 1259 | tmpcolor.A = tmpcolor.A * 255; |
1260 | tmpcolor.R = tmpcolor.R * 255; | 1260 | tmpcolor.R = tmpcolor.R * 255; |
1261 | tmpcolor.G = tmpcolor.G * 255; | 1261 | tmpcolor.G = tmpcolor.G * 255; |
1262 | tmpcolor.B = tmpcolor.B * 255; | 1262 | tmpcolor.B = tmpcolor.B * 255; |
1263 | tex.DefaultTexture.RGBA = tmpcolor; | 1263 | tex.FaceTextures[0].RGBA = tmpcolor; |
1264 | UpdateTextureEntry(tex.ToBytes()); | 1264 | UpdateTextureEntry(tex.ToBytes()); |
1265 | } | 1265 | } |
1266 | 1266 | ||
@@ -1544,8 +1544,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1544 | public InventoryStringBuilder(LLUUID folderID, LLUUID parentID) | 1544 | public InventoryStringBuilder(LLUUID folderID, LLUUID parentID) |
1545 | { | 1545 | { |
1546 | BuildString += "\tinv_object\t0\n\t{\n"; | 1546 | BuildString += "\tinv_object\t0\n\t{\n"; |
1547 | AddNameValueLine("obj_id", folderID.ToStringHyphenated()); | 1547 | AddNameValueLine("obj_id", folderID.ToString()); |
1548 | AddNameValueLine("parent_id", parentID.ToStringHyphenated()); | 1548 | AddNameValueLine("parent_id", parentID.ToString()); |
1549 | AddNameValueLine("type", "category"); | 1549 | AddNameValueLine("type", "category"); |
1550 | AddNameValueLine("name", "Contents"); | 1550 | AddNameValueLine("name", "Contents"); |
1551 | AddSectionEnd(); | 1551 | AddSectionEnd(); |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 62abefc..a221243 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1033,11 +1033,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1033 | { | 1033 | { |
1034 | LLVector3 pos = m_pos; | 1034 | LLVector3 pos = m_pos; |
1035 | LLVector3 vel = Velocity; | 1035 | LLVector3 vel = Velocity; |
1036 | LLQuaternion rot; | 1036 | LLQuaternion rot=new LLQuaternion(m_bodyRot.x, m_bodyRot.y, m_bodyRot.z, m_bodyRot.w); |
1037 | rot.X = m_bodyRot.x; | ||
1038 | rot.Y = m_bodyRot.y; | ||
1039 | rot.Z = m_bodyRot.z; | ||
1040 | rot.W = m_bodyRot.w; | ||
1041 | remoteClient.SendAvatarTerseUpdate(m_regionHandle, 64096, LocalId, new LLVector3(pos.X, pos.Y, pos.Z), | 1037 | remoteClient.SendAvatarTerseUpdate(m_regionHandle, 64096, LocalId, new LLVector3(pos.X, pos.Y, pos.Z), |
1042 | new LLVector3(vel.X, vel.Y, vel.Z), rot); | 1038 | new LLVector3(vel.X, vel.Y, vel.Z), rot); |
1043 | } | 1039 | } |