aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-11-01 19:19:05 +0000
committerlbsa712007-11-01 19:19:05 +0000
commit4fad66f855544b9298ae2216c58c0f44009358a5 (patch)
tree07747305928e0072230b31c399d8a7e76442b77f
parentPartialy fixed a bug with collisions in BulletXPlugin. (diff)
downloadopensim-SC-4fad66f855544b9298ae2216c58c0f44009358a5.zip
opensim-SC-4fad66f855544b9298ae2216c58c0f44009358a5.tar.gz
opensim-SC-4fad66f855544b9298ae2216c58c0f44009358a5.tar.bz2
opensim-SC-4fad66f855544b9298ae2216c58c0f44009358a5.tar.xz
* Diuerse beavtificatems
Diffstat
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCache.cs6
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/InventoryConfig.cs42
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs20
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs5
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs3
-rw-r--r--OpenSim/Framework/Servers/IStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/RestDeserialiseHandler.cs17
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs6
-rw-r--r--OpenSim/Region/ClientStack/ClientView.PacketQueue.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs7
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/WorldCommModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs102
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs28
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs4
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs4
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs5
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs2
-rw-r--r--OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs2
30 files changed, 150 insertions, 150 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 6222649..6be0852 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -52,10 +52,10 @@ namespace OpenSim.Framework.Communications.Cache
52 public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent 52 public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent
53 53
54 public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>(); 54 public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>();
55 //Assets requested from the asset server 55 //Assets requested from the asset server
56 56
57 public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>(); 57 public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>();
58 //Textures requested from the asset server 58 //Textures requested from the asset server
59 59
60 public Dictionary<LLUUID, TextureSender> SendingTextures = new Dictionary<LLUUID, TextureSender>(); 60 public Dictionary<LLUUID, TextureSender> SendingTextures = new Dictionary<LLUUID, TextureSender>();
61 private BlockingQueue<TextureSender> QueueTextures = new BlockingQueue<TextureSender>(); 61 private BlockingQueue<TextureSender> QueueTextures = new BlockingQueue<TextureSender>();
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index ccf5024..74b2440 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework.Communications.Cache
90 { 90 {
91 InventoryFolderImpl createdFolder = 91 InventoryFolderImpl createdFolder =
92 userProfile.RootFolder.CreateNewSubFolder(folderID, folderName, folderType); 92 userProfile.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
93 93
94 if (createdFolder != null) 94 if (createdFolder != null)
95 { 95 {
96 m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder); 96 m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
@@ -119,7 +119,7 @@ namespace OpenSim.Framework.Communications.Cache
119 119
120 return; 120 return;
121 } 121 }
122 122
123 if ((fold = libraryRoot.HasSubFolder(folderID)) != null) 123 if ((fold = libraryRoot.HasSubFolder(folderID)) != null)
124 { 124 {
125 remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, folderID, fold.RequestListOfItems()); 125 remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, folderID, fold.RequestListOfItems());
@@ -129,7 +129,7 @@ namespace OpenSim.Framework.Communications.Cache
129 129
130 CachedUserInfo userProfile; 130 CachedUserInfo userProfile;
131 if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile)) 131 if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile))
132 { 132 {
133 if (userProfile.RootFolder != null) 133 if (userProfile.RootFolder != null)
134 { 134 {
135 if (userProfile.RootFolder.folderID == folderID) 135 if (userProfile.RootFolder.folderID == folderID)
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 887be3b..62c50d5 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -444,4 +444,4 @@ namespace OpenSim.Framework
444 event Action<IClientAPI> OnConnectionClosed; 444 event Action<IClientAPI> OnConnectionClosed;
445 void SendLogoutPacket(); 445 void SendLogoutPacket();
446 } 446 }
447} 447} \ No newline at end of file
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 8e64b68..1233196 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -1,7 +1,3 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Framework 1namespace OpenSim.Framework
6{ 2{
7 /// <summary> 3 /// <summary>
@@ -23,18 +19,28 @@ namespace OpenSim.Framework
23 19
24 public InventoryConfig(string description, string filename) 20 public InventoryConfig(string description, string filename)
25 { 21 {
26 configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); 22 configMember =
23 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
27 configMember.performConfigurationRetrieve(); 24 configMember.performConfigurationRetrieve();
28 } 25 }
29 26
30 public void loadConfigurationOptions() 27 public void loadConfigurationOptions()
31 { 28 {
32 configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false); 29 configMember.addConfigurationOption("default_startup_message",
33 configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false); 30 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
34 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); 31 "Default Startup Message", "Welcome to OGS", false);
35 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false); 32 configMember.addConfigurationOption("default_user_server",
36 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 33 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
37 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Http Listener port", DefaultHttpPort.ToString(), false); 34 "Default User Server URI",
35 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false);
36 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
37 "Key to send to user server", "null", false);
38 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
39 "Key to expect from user server", "null", false);
40 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
41 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
42 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
43 "Http Listener port", DefaultHttpPort.ToString(), false);
38 } 44 }
39 45
40 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 46 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -42,26 +48,26 @@ namespace OpenSim.Framework
42 switch (configuration_key) 48 switch (configuration_key)
43 { 49 {
44 case "default_startup_message": 50 case "default_startup_message":
45 this.DefaultStartupMsg = (string)configuration_result; 51 DefaultStartupMsg = (string) configuration_result;
46 break; 52 break;
47 case "default_user_server": 53 case "default_user_server":
48 this.UserServerURL = (string)configuration_result; 54 UserServerURL = (string) configuration_result;
49 break; 55 break;
50 case "user_send_key": 56 case "user_send_key":
51 this.UserSendKey = (string)configuration_result; 57 UserSendKey = (string) configuration_result;
52 break; 58 break;
53 case "user_recv_key": 59 case "user_recv_key":
54 this.UserRecvKey = (string)configuration_result; 60 UserRecvKey = (string) configuration_result;
55 break; 61 break;
56 case "database_provider": 62 case "database_provider":
57 this.DatabaseProvider = (string)configuration_result; 63 DatabaseProvider = (string) configuration_result;
58 break; 64 break;
59 case "http_port": 65 case "http_port":
60 HttpPort = (int)configuration_result; 66 HttpPort = (int) configuration_result;
61 break; 67 break;
62 } 68 }
63 69
64 return true; 70 return true;
65 } 71 }
66 } 72 }
67} 73} \ No newline at end of file
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 331013f..80f631e 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -25,10 +25,9 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Xml.Serialization;
30using System.Collections; 28using System.Collections;
31using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Xml.Serialization;
32using libsecondlife; 31using libsecondlife;
33 32
34namespace OpenSim.Framework 33namespace OpenSim.Framework
@@ -251,23 +250,20 @@ namespace OpenSim.Framework
251 * class defined in Communications.Framework.Communications.Caches. So we serialize/deserialize 250 * class defined in Communications.Framework.Communications.Caches. So we serialize/deserialize
252 * into this simpler class, and then use that. 251 * into this simpler class, and then use that.
253 */ 252 */
253
254 [XmlRoot(ElementName = "inventory", IsNullable = true)] 254 [XmlRoot(ElementName = "inventory", IsNullable = true)]
255 public class SerializableInventory 255 public class SerializableInventory
256 { 256 {
257 [XmlRoot(ElementName = "folder", IsNullable = true)] 257 [XmlRoot(ElementName = "folder", IsNullable = true)]
258 public class SerializableFolder : InventoryFolderBase 258 public class SerializableFolder : InventoryFolderBase
259 { 259 {
260 [XmlArray(ElementName = "folders", IsNullable = true)] 260 [XmlArray(ElementName = "folders", IsNullable = true)] [XmlArrayItem(ElementName = "folder", IsNullable = true, Type = typeof (SerializableFolder))] public
261 [XmlArrayItem(ElementName = "folder", IsNullable = true, Type = typeof(SerializableFolder))] 261 ArrayList SubFolders;
262 public ArrayList SubFolders;
263 262
264 [XmlArray(ElementName = "items", IsNullable = true)] 263 [XmlArray(ElementName = "items", IsNullable = true)] [XmlArrayItem(ElementName = "item", IsNullable = true, Type = typeof (InventoryItemBase))] public ArrayList
265 [XmlArrayItem(ElementName = "item", IsNullable = true, Type = typeof(InventoryItemBase))] 264 Items;
266 public ArrayList Items;
267 } 265 }
268 266
269 [XmlElement(ElementName = "folder", IsNullable = true)] 267 [XmlElement(ElementName = "folder", IsNullable = true)] public SerializableFolder root;
270 public SerializableFolder root;
271 } 268 }
272 269} \ No newline at end of file
273}
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index b9ce143..1c76320 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -94,7 +94,8 @@ namespace OpenSim.Framework
94 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); 94 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
95 AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL); 95 AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
96 InventoryURL = config.Configs["Network"].GetString("inventory_server_url", 96 InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
97 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); 97 "http://127.0.0.1:" +
98 InventoryConfig.DefaultHttpPort.ToString());
98 } 99 }
99 } 100 }
100} 101} \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index a4a7b2b..e645e7b 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -107,11 +107,10 @@ namespace OpenSim.Framework.Servers
107 { 107 {
108 IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler; 108 IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler;
109 buffer = streamedRequestHandler.Handle(path, request.InputStream); 109 buffer = streamedRequestHandler.Handle(path, request.InputStream);
110
111 } 110 }
112 else 111 else
113 { 112 {
114 IStreamHandler streamHandler = (IStreamHandler)requestHandler; 113 IStreamHandler streamHandler = (IStreamHandler) requestHandler;
115 114
116 using (MemoryStream memoryStream = new MemoryStream()) 115 using (MemoryStream memoryStream = new MemoryStream())
117 { 116 {
diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/IStreamHandler.cs
index 6dc7189..c87937a 100644
--- a/OpenSim/Framework/Servers/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/IStreamHandler.cs
@@ -53,5 +53,4 @@ namespace OpenSim.Framework.Servers
53 // Handle request stream, return byte array 53 // Handle request stream, return byte array
54 void Handle(string path, Stream request, Stream response); 54 void Handle(string path, Stream request, Stream response);
55 } 55 }
56
57} \ No newline at end of file 56} \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
index 28084e2..adf5c3f 100644
--- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
@@ -1,6 +1,3 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.IO; 1using System.IO;
5using System.Xml; 2using System.Xml;
6using System.Xml.Serialization; 3using System.Xml.Serialization;
@@ -20,22 +17,22 @@ namespace OpenSim.Framework.Servers
20 m_method = method; 17 m_method = method;
21 } 18 }
22 19
23 public void Handle(string path, Stream request, Stream responseStream ) 20 public void Handle(string path, Stream request, Stream responseStream)
24 { 21 {
25 TRequest deserial; 22 TRequest deserial;
26 using (XmlTextReader xmlReader = new XmlTextReader(request)) 23 using (XmlTextReader xmlReader = new XmlTextReader(request))
27 { 24 {
28 XmlSerializer deserializer = new XmlSerializer(typeof(TRequest)); 25 XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
29 deserial = (TRequest)deserializer.Deserialize(xmlReader); 26 deserial = (TRequest) deserializer.Deserialize(xmlReader);
30 } 27 }
31 28
32 TResponse response = m_method(deserial); 29 TResponse response = m_method(deserial);
33 30
34 using (XmlWriter xmlWriter = XmlTextWriter.Create( responseStream )) 31 using (XmlWriter xmlWriter = XmlTextWriter.Create(responseStream))
35 { 32 {
36 XmlSerializer serializer = new XmlSerializer(typeof(TResponse)); 33 XmlSerializer serializer = new XmlSerializer(typeof (TResponse));
37 serializer.Serialize(xmlWriter, response ); 34 serializer.Serialize(xmlWriter, response);
38 } 35 }
39 } 36 }
40 } 37 }
41} 38} \ No newline at end of file
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index aabd471..16bb69e 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -775,4 +775,4 @@ namespace OpenSim
775 775
776 #endregion 776 #endregion
777 } 777 }
778} 778} \ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 1597cc5..83b4cbc 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -382,7 +382,7 @@ namespace OpenSim.Region.ClientStack
382 newSimPack.Info = new CrossedRegionPacket.InfoBlock(); 382 newSimPack.Info = new CrossedRegionPacket.InfoBlock();
383 newSimPack.Info.Position = pos; 383 newSimPack.Info.Position = pos;
384 newSimPack.Info.LookAt = look; 384 newSimPack.Info.LookAt = look;
385 // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!! 385 // new LLVector3(0.0f, 0.0f, 0.0f); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
386 newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock(); 386 newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock();
387 newSimPack.RegionData.RegionHandle = newRegionHandle; 387 newSimPack.RegionData.RegionHandle = newRegionHandle;
388 byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes(); 388 byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes();
@@ -847,7 +847,7 @@ namespace OpenSim.Region.ClientStack
847 { 847 {
848 AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket(); 848 AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
849 aw.AgentData.AgentID = AgentId; 849 aw.AgentData.AgentID = AgentId;
850 aw.AgentData.SerialNum = (uint)serial; 850 aw.AgentData.SerialNum = (uint) serial;
851 aw.AgentData.SessionID = m_sessionId; 851 aw.AgentData.SessionID = m_sessionId;
852 852
853 aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13]; 853 aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
@@ -1296,7 +1296,7 @@ namespace OpenSim.Region.ClientStack
1296 protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry) 1296 protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
1297 { 1297 {
1298 ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); 1298 ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock();
1299 // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i); 1299 // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
1300 1300
1301 SetDefaultAvatarPacketValues(ref objdata); 1301 SetDefaultAvatarPacketValues(ref objdata);
1302 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24); 1302 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
index 2678a98..dc7952e 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketQueue.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ClientStack
152 else 152 else
153 { 153 {
154 m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode); 154 m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, m_circuitCode);
155 //userEP); 155 //userEP);
156 } 156 }
157 } 157 }
158 catch (Exception) 158 catch (Exception)
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 1e14587..7c1a663 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -202,7 +202,7 @@ namespace OpenSim.Region.ClientStack
202 case PacketType.AgentRequestSit: 202 case PacketType.AgentRequestSit:
203 if (OnAgentRequestSit != null) 203 if (OnAgentRequestSit != null)
204 { 204 {
205 AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack; 205 AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket) Pack;
206 OnAgentRequestSit(this, agentRequestSit.AgentData.AgentID, 206 OnAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
207 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); 207 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
208 } 208 }
@@ -770,4 +770,4 @@ namespace OpenSim.Region.ClientStack
770 OutPacket(logReply); 770 OutPacket(logReply);
771 } 771 }
772 } 772 }
773} 773} \ No newline at end of file
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 730c199..0e35488 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.ClientStack
54 new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients 54 new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
55 55
56 protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); 56 protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>();
57 //local handlers for this instance 57 //local handlers for this instance
58 58
59 private LLUUID m_sessionId; 59 private LLUUID m_sessionId;
60 public LLUUID SecureSessionID = LLUUID.Zero; 60 public LLUUID SecureSessionID = LLUUID.Zero;
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ClientStack
203 { 203 {
204 if (debug > 0) 204 if (debug > 0)
205 { 205 {
206 string info= ""; 206 string info = "";
207 if (debug < 255 && packet.Type == PacketType.AgentUpdate) 207 if (debug < 255 && packet.Type == PacketType.AgentUpdate)
208 return; 208 return;
209 if (debug < 254 && packet.Type == PacketType.ViewerEffect) 209 if (debug < 254 && packet.Type == PacketType.ViewerEffect)
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 3a0b47f..f78c086 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Communications.Local
132 map.Y = (ushort) regInfo.RegionLocY; 132 map.Y = (ushort) regInfo.RegionLocY;
133 map.WaterHeight = (byte) regInfo.EstateSettings.waterHeight; 133 map.WaterHeight = (byte) regInfo.EstateSettings.waterHeight;
134 map.MapImageId = regInfo.EstateSettings.terrainImageID; 134 map.MapImageId = regInfo.EstateSettings.terrainImageID;
135 //new LLUUID("00000000-0000-0000-9999-000000000007"); 135 //new LLUUID("00000000-0000-0000-9999-000000000007");
136 map.Agents = 1; 136 map.Agents = 1;
137 map.RegionFlags = 72458694; 137 map.RegionFlags = 72458694;
138 map.Access = 13; 138 map.Access = 13;
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 1281a44..5da36fc 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -46,4 +46,4 @@ namespace OpenSim.Region.Communications.OGS1
46 m_userService = new OGS1UserServices(this); 46 m_userService = new OGS1UserServices(this);
47 } 47 }
48 } 48 }
49} 49} \ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 85df353..7597e79 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -25,9 +25,6 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.IO;
30using System.Xml.Serialization;
31using System.Collections.Generic; 28using System.Collections.Generic;
32using libsecondlife; 29using libsecondlife;
33using OpenSim.Framework; 30using OpenSim.Framework;
@@ -38,7 +35,7 @@ namespace OpenSim.Region.Communications.OGS1
38{ 35{
39 public class OGS1InventoryService : IInventoryServices 36 public class OGS1InventoryService : IInventoryServices
40 { 37 {
41 string _inventoryServerUrl; 38 private string _inventoryServerUrl;
42 39
43 public OGS1InventoryService(string inventoryServerUrl) 40 public OGS1InventoryService(string inventoryServerUrl)
44 { 41 {
@@ -88,4 +85,4 @@ namespace OpenSim.Region.Communications.OGS1
88 85
89 #endregion 86 #endregion
90 } 87 }
91} 88} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 99b69e1..9d4187a 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -431,4 +431,4 @@ namespace OpenSim.Region.Environment.Modules
431 m_tcp.Close(); 431 m_tcp.Close();
432 } 432 }
433 } 433 }
434} 434} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
index 5af2ce3..7a631d7 100644
--- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
@@ -490,4 +490,4 @@ namespace OpenSim.Region.Environment.Modules
490 return m_id; 490 return m_id;
491 } 491 }
492 } 492 }
493} 493} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 73954d0..73d317a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -332,16 +332,14 @@ namespace OpenSim.Region.Environment.Scenes
332 { 332 {
333 if (ent is SceneObjectGroup) 333 if (ent is SceneObjectGroup)
334 { 334 {
335 hasprim = ((SceneObjectGroup)ent).HasChildPrim(localID); 335 hasprim = ((SceneObjectGroup) ent).HasChildPrim(localID);
336 if (hasprim != false) 336 if (hasprim != false)
337 { 337 {
338 338 ((SceneObjectGroup) ent).UpdatePrimFlags(localID, (ushort) packet.Type, true, packet.ToBytes());
339 ((SceneObjectGroup)ent).UpdatePrimFlags(localID, (ushort)packet.Type, true, packet.ToBytes());
340
341 } 339 }
342 } 340 }
343 } 341 }
344 342
345 //System.Console.WriteLine("Got primupdate packet: " + packet.UsePhysics.ToString()); 343 //System.Console.WriteLine("Got primupdate packet: " + packet.UsePhysics.ToString());
346 } 344 }
347 345
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8da22c4..d02f3e3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1565,4 +1565,4 @@ namespace OpenSim.Region.Environment.Scenes
1565 } 1565 }
1566 } 1566 }
1567 } 1567 }
1568} 1568} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index aaa25e7..2f746b2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -341,8 +341,9 @@ namespace OpenSim.Region.Environment.Scenes
341 /// 341 ///
342 /// </summary> 342 /// </summary>
343 public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, 343 public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos,
344 PrimitiveBaseShape shape):this(scene, regionHandle, ownerID, localID, pos, LLQuaternion.Identity, shape) 344 PrimitiveBaseShape shape)
345 { 345 : this(scene, regionHandle, ownerID, localID, pos, LLQuaternion.Identity, shape)
346 {
346 } 347 }
347 348
348 #endregion 349 #endregion
@@ -927,6 +928,7 @@ namespace OpenSim.Region.Environment.Scenes
927 part.UpdatePrimFlags(type, inUse, data); 928 part.UpdatePrimFlags(type, inUse, data);
928 } 929 }
929 } 930 }
931
930 public void UpdateExtraParam(uint localID, ushort type, bool inUse, byte[] data) 932 public void UpdateExtraParam(uint localID, ushort type, bool inUse, byte[] data)
931 { 933 {
932 SceneObjectPart part = GetChildPart(localID); 934 SceneObjectPart part = GetChildPart(localID);
@@ -1394,4 +1396,4 @@ namespace OpenSim.Region.Environment.Scenes
1394 Text = text; 1396 Text = text;
1395 } 1397 }
1396 } 1398 }
1397} 1399} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index dacac4b..38eaf90 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -272,9 +272,10 @@ namespace OpenSim.Region.Environment.Scenes
272 } 272 }
273 273
274 public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, 274 public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID,
275 PrimitiveBaseShape shape, LLVector3 groupPosition, LLVector3 offsetPosition):this(regionHandle, parent, ownerID, localID, shape, groupPosition, LLQuaternion.Identity, offsetPosition) 275 PrimitiveBaseShape shape, LLVector3 groupPosition, LLVector3 offsetPosition)
276 { 276 : this(regionHandle, parent, ownerID, localID, shape, groupPosition, LLQuaternion.Identity, offsetPosition)
277 } 277 {
278 }
278 279
279 /// <summary> 280 /// <summary>
280 /// Create a completely new SceneObjectPart (prim) 281 /// Create a completely new SceneObjectPart (prim)
@@ -286,7 +287,8 @@ namespace OpenSim.Region.Environment.Scenes
286 /// <param name="shape"></param> 287 /// <param name="shape"></param>
287 /// <param name="position"></param> 288 /// <param name="position"></param>
288 public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, 289 public SceneObjectPart(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID,
289 PrimitiveBaseShape shape, LLVector3 groupPosition, LLQuaternion rotationOffset, LLVector3 offsetPosition) 290 PrimitiveBaseShape shape, LLVector3 groupPosition, LLQuaternion rotationOffset,
291 LLVector3 offsetPosition)
290 { 292 {
291 m_name = "Primitive"; 293 m_name = "Primitive";
292 m_regionHandle = regionHandle; 294 m_regionHandle = regionHandle;
@@ -313,12 +315,12 @@ namespace OpenSim.Region.Environment.Scenes
313 m_flags = 0; 315 m_flags = 0;
314 m_flags |= LLObject.ObjectFlags.ObjectModify | 316 m_flags |= LLObject.ObjectFlags.ObjectModify |
315 LLObject.ObjectFlags.ObjectCopy | 317 LLObject.ObjectFlags.ObjectCopy |
316 LLObject.ObjectFlags.ObjectYouOwner | 318 LLObject.ObjectFlags.ObjectYouOwner |
317 LLObject.ObjectFlags.Touch | 319 LLObject.ObjectFlags.Touch |
318 LLObject.ObjectFlags.ObjectMove | 320 LLObject.ObjectFlags.ObjectMove |
319 LLObject.ObjectFlags.AllowInventoryDrop | 321 LLObject.ObjectFlags.AllowInventoryDrop |
320 LLObject.ObjectFlags.ObjectTransfer | 322 LLObject.ObjectFlags.ObjectTransfer |
321 LLObject.ObjectFlags.CreateSelected | 323 LLObject.ObjectFlags.CreateSelected |
322 LLObject.ObjectFlags.ObjectOwnerModify; 324 LLObject.ObjectFlags.ObjectOwnerModify;
323 325
324 ScheduleFullUpdate(); 326 ScheduleFullUpdate();
@@ -447,23 +449,25 @@ namespace OpenSim.Region.Environment.Scenes
447 TimeStampFull = (uint) Util.UnixTimeSinceEpoch(); 449 TimeStampFull = (uint) Util.UnixTimeSinceEpoch();
448 m_updateFlag = 2; 450 m_updateFlag = 2;
449 } 451 }
452
450 public void AddFlag(LLObject.ObjectFlags flag) 453 public void AddFlag(LLObject.ObjectFlags flag)
451 { 454 {
452 LLObject.ObjectFlags prevflag = m_flags; 455 LLObject.ObjectFlags prevflag = m_flags;
453 //uint objflags = m_flags; 456 //uint objflags = m_flags;
454 if ((this.ObjectFlags & (uint)flag) == 0) 457 if ((ObjectFlags & (uint) flag) == 0)
455 { 458 {
456 //Console.WriteLine("Adding flag: " + ((LLObject.ObjectFlags) flag).ToString()); 459 //Console.WriteLine("Adding flag: " + ((LLObject.ObjectFlags) flag).ToString());
457 m_flags |= flag; 460 m_flags |= flag;
458 } 461 }
459 uint currflag = (uint)m_flags; 462 uint currflag = (uint) m_flags;
460 //System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + m_flags.ToString()); 463 //System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + m_flags.ToString());
461 //ScheduleFullUpdate(); 464 //ScheduleFullUpdate();
462 } 465 }
466
463 public void RemFlag(LLObject.ObjectFlags flag) 467 public void RemFlag(LLObject.ObjectFlags flag)
464 { 468 {
465 LLObject.ObjectFlags prevflag = m_flags; 469 LLObject.ObjectFlags prevflag = m_flags;
466 if ((this.ObjectFlags & (uint) flag) != 0) 470 if ((ObjectFlags & (uint) flag) != 0)
467 { 471 {
468 //Console.WriteLine("Removing flag: " + ((LLObject.ObjectFlags)flag).ToString()); 472 //Console.WriteLine("Removing flag: " + ((LLObject.ObjectFlags)flag).ToString());
469 m_flags &= ~flag; 473 m_flags &= ~flag;
@@ -640,6 +644,7 @@ namespace OpenSim.Region.Environment.Scenes
640 #endregion 644 #endregion
641 645
642 #region ExtraParams 646 #region ExtraParams
647
643 public void UpdatePrimFlags(ushort type, bool inUse, byte[] data) 648 public void UpdatePrimFlags(ushort type, bool inUse, byte[] data)
644 { 649 {
645 bool hasPrim = false; 650 bool hasPrim = false;
@@ -649,8 +654,8 @@ namespace OpenSim.Region.Environment.Scenes
649 bool CastsShadows = false; 654 bool CastsShadows = false;
650 //bool IsLocked = false; 655 //bool IsLocked = false;
651 int i = 0; 656 int i = 0;
652 657
653 658
654 try 659 try
655 { 660 {
656 i += 46; 661 i += 46;
@@ -661,40 +666,41 @@ namespace OpenSim.Region.Environment.Scenes
661 IsPhantom = (data[i++] != 0) ? true : false; 666 IsPhantom = (data[i++] != 0) ? true : false;
662 CastsShadows = (data[i++] != 0) ? true : false; 667 CastsShadows = (data[i++] != 0) ? true : false;
663 } 668 }
664 catch (System.Exception e) 669 catch (Exception e)
665 { 670 {
666 System.Console.WriteLine("Ignoring invalid Packet:"); 671 Console.WriteLine("Ignoring invalid Packet:");
667 //Silently ignore it - TODO: FIXME Quick 672 //Silently ignore it - TODO: FIXME Quick
668 } 673 }
669 674
670 if (IsPhantom) 675 if (IsPhantom)
671 { 676 {
672 AddFlag(LLObject.ObjectFlags.Phantom); 677 AddFlag(LLObject.ObjectFlags.Phantom);
673 if(this.PhysActor != null) { 678 if (PhysActor != null)
674 this.m_parentGroup.m_scene.PhysScene.RemovePrim(this.PhysActor); /// that's not wholesome. Had to make m_scene public 679 {
675 this.PhysActor = null; 680 m_parentGroup.m_scene.PhysScene.RemovePrim(PhysActor);
681 /// that's not wholesome. Had to make m_scene public
682 PhysActor = null;
676 } 683 }
677 } 684 }
678 else 685 else
679 { 686 {
680 RemFlag(LLObject.ObjectFlags.Phantom); 687 RemFlag(LLObject.ObjectFlags.Phantom);
681 if (this.PhysActor == null) 688 if (PhysActor == null)
682 { 689 {
683 this.PhysActor = this.m_parentGroup.m_scene.PhysScene.AddPrimShape( 690 PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape(
684 this.Name, 691 Name,
685 this.Shape, 692 Shape,
686 new PhysicsVector(this.AbsolutePosition.X, this.AbsolutePosition.Y, 693 new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y,
687 this.AbsolutePosition.Z), 694 AbsolutePosition.Z),
688 new PhysicsVector(this.Scale.X, this.Scale.Y, this.Scale.Z), 695 new PhysicsVector(Scale.X, Scale.Y, Scale.Z),
689 new Quaternion(this.RotationOffset.W, this.RotationOffset.X, 696 new Quaternion(RotationOffset.W, RotationOffset.X,
690 this.RotationOffset.Y, this.RotationOffset.Z)); 697 RotationOffset.Y, RotationOffset.Z));
691 } 698 }
692 } 699 }
693 700
694 if (UsePhysics) 701 if (UsePhysics)
695 { 702 {
696 AddFlag(LLObject.ObjectFlags.Physics); 703 AddFlag(LLObject.ObjectFlags.Physics);
697
698 } 704 }
699 else 705 else
700 { 706 {
@@ -710,9 +716,6 @@ namespace OpenSim.Region.Environment.Scenes
710 } 716 }
711// System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString()); 717// System.Console.WriteLine("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
712 ScheduleFullUpdate(); 718 ScheduleFullUpdate();
713
714
715
716 } 719 }
717 720
718 public void UpdateExtraParam(ushort type, bool inUse, byte[] data) 721 public void UpdateExtraParam(ushort type, bool inUse, byte[] data)
@@ -861,22 +864,21 @@ namespace OpenSim.Region.Environment.Scenes
861 { 864 {
862 LLQuaternion lRot; 865 LLQuaternion lRot;
863 lRot = RotationOffset; 866 lRot = RotationOffset;
864 uint clientFlags = ObjectFlags & ~(uint)LLObject.ObjectFlags.CreateSelected; 867 uint clientFlags = ObjectFlags & ~(uint) LLObject.ObjectFlags.CreateSelected;
865 868
866 List<ScenePresence> avatars=m_parentGroup.GetScenePresences(); 869 List<ScenePresence> avatars = m_parentGroup.GetScenePresences();
867 foreach(ScenePresence s in avatars) 870 foreach (ScenePresence s in avatars)
868 { 871 {
869 if(s.m_uuid == OwnerID) 872 if (s.m_uuid == OwnerID)
870 { 873 {
871 if(s.ControllingClient == remoteClient) 874 if (s.ControllingClient == remoteClient)
872 { 875 {
873 clientFlags = ObjectFlags; 876 clientFlags = ObjectFlags;
874 m_flags &= ~LLObject.ObjectFlags.CreateSelected; 877 m_flags &= ~LLObject.ObjectFlags.CreateSelected;
875 878 }
876 } 879 break;
877 break; 880 }
878 } 881 }
879 }
880 882
881 remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalID, m_shape, lPos, clientFlags, m_uuid, 883 remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalID, m_shape, lPos, clientFlags, m_uuid,
882 OwnerID, 884 OwnerID,
@@ -1042,4 +1044,4 @@ namespace OpenSim.Region.Environment.Scenes
1042 } 1044 }
1043 } 1045 }
1044 } 1046 }
1045} 1047} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 763be03..f2d0219 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -455,7 +455,7 @@ namespace OpenSim.Region.Environment.Scenes
455 455
456 // Must check for standing up even when PhysicsActor is null, 456 // Must check for standing up even when PhysicsActor is null,
457 // since sitting currently removes avatar from physical scene 457 // since sitting currently removes avatar from physical scene
458 if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) 458 if ((flags & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
459 { 459 {
460 StandUp(); 460 StandUp();
461 UpdateMovementAnimations(true); 461 UpdateMovementAnimations(true);
@@ -526,7 +526,8 @@ namespace OpenSim.Region.Environment.Scenes
526 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); 526 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
527 LLVector3 pos = new LLVector3(); 527 LLVector3 pos = new LLVector3();
528 if (part != null) 528 if (part != null)
529 pos = part.AbsolutePosition + m_requestedSitOffset + new LLVector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); 529 pos = part.AbsolutePosition + m_requestedSitOffset +
530 new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
530 MakeRootAgent(pos, false); 531 MakeRootAgent(pos, false);
531 m_parentID = 0; 532 m_parentID = 0;
532 SendFullUpdateToAllClients(); 533 SendFullUpdateToAllClients();
@@ -569,7 +570,7 @@ namespace OpenSim.Region.Environment.Scenes
569 570
570 remoteClient.OutPacket(avatarSitResponse); 571 remoteClient.OutPacket(avatarSitResponse);
571 } 572 }
572 573
573 public void HandleAgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID, LLVector3 offset) 574 public void HandleAgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID, LLVector3 offset)
574 { 575 {
575 SendSitResponse(remoteClient, targetID, offset); 576 SendSitResponse(remoteClient, targetID, offset);
@@ -597,7 +598,8 @@ namespace OpenSim.Region.Environment.Scenes
597 { 598 {
598 // these magic numbers come mostly from experimenting with ODE, 599 // these magic numbers come mostly from experimenting with ODE,
599 // and seeing what looks right 600 // and seeing what looks right
600 AbsolutePosition = m_requestedSitOffset + new LLVector3(m_physicsActor.Size.X / 2.7f, 0f, m_physicsActor.Size.Z / 1.45f); 601 AbsolutePosition = m_requestedSitOffset +
602 new LLVector3(m_physicsActor.Size.X/2.7f, 0f, m_physicsActor.Size.Z/1.45f);
601 m_parentID = m_requestedSitTargetID; 603 m_parentID = m_requestedSitTargetID;
602 MakeChildAgent(); 604 MakeChildAgent();
603 SendAnimPack(Animations.AnimsLLUUID["SIT"], 1); 605 SendAnimPack(Animations.AnimsLLUUID["SIT"], 1);
@@ -616,20 +618,21 @@ namespace OpenSim.Region.Environment.Scenes
616 } 618 }
617 else 619 else
618 { 620 {
619 if (((m_movementflag & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && PhysicsActor.IsColliding) 621 if (((m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) &&
622 PhysicsActor.IsColliding)
620 { 623 {
621 SendAnimPack(Animations.AnimsLLUUID["CROUCHWALK"], 1); 624 SendAnimPack(Animations.AnimsLLUUID["CROUCHWALK"], 1);
622 } 625 }
623 else 626 else
624 { 627 {
625 SendAnimPack(Animations.AnimsLLUUID["WALK"], 1); 628 SendAnimPack(Animations.AnimsLLUUID["WALK"], 1);
626 } 629 }
627
628 } 630 }
629 } 631 }
630 else 632 else
631 { 633 {
632 if (((m_movementflag & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && PhysicsActor.IsColliding) 634 if (((m_movementflag & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) &&
635 PhysicsActor.IsColliding)
633 { 636 {
634 SendAnimPack(Animations.AnimsLLUUID["CROUCH"], 1); 637 SendAnimPack(Animations.AnimsLLUUID["CROUCH"], 1);
635 } 638 }
@@ -656,7 +659,9 @@ namespace OpenSim.Region.Environment.Scenes
656 659
657 direc = direc*((0.03f)*128f); 660 direc = direc*((0.03f)*128f);
658 if (m_physicsActor.Flying) 661 if (m_physicsActor.Flying)
659 { direc *= 4; } 662 {
663 direc *= 4;
664 }
660 else 665 else
661 { 666 {
662 if (!m_physicsActor.Flying && m_physicsActor.IsColliding) 667 if (!m_physicsActor.Flying && m_physicsActor.IsColliding)
@@ -668,7 +673,6 @@ namespace OpenSim.Region.Environment.Scenes
668 //System.Console.WriteLine("Jump"); 673 //System.Console.WriteLine("Jump");
669 SendAnimPack(Animations.AnimsLLUUID["PRE_JUMP"], 1); 674 SendAnimPack(Animations.AnimsLLUUID["PRE_JUMP"], 1);
670 } 675 }
671
672 } 676 }
673 } 677 }
674 678
@@ -1093,4 +1097,4 @@ namespace OpenSim.Region.Environment.Scenes
1093 m_controllingClient.SendWearables(m_wearables, m_wearablesSerial++); 1097 m_controllingClient.SendWearables(m_wearables, m_wearablesSerial++);
1094 } 1098 }
1095 } 1099 }
1096} 1100} \ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
index 41dc567..dc93b89 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/Types/BaseType.cs
@@ -27,12 +27,10 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections.Generic;
31using System.Text;
32 30
33namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types 31namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.Types
34{ 32{
35 public class BaseType : Object 33 public class BaseType : Object
36 { 34 {
37 } 35 }
38} 36} \ No newline at end of file
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
index 2778e9c..8cd94c3 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
47 foreach (KeyValuePair<string, IScript> script in compiledscripts) 47 foreach (KeyValuePair<string, IScript> script in compiledscripts)
48 { 48 {
49 ScriptInfo scriptInfo = new ScriptInfo(m_scene); 49 ScriptInfo scriptInfo = new ScriptInfo(m_scene);
50 // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script. 50 // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
51 MainLog.Instance.Verbose("Loading " + script.Key); 51 MainLog.Instance.Verbose("Loading " + script.Key);
52 script.Value.Initialise(scriptInfo); 52 script.Value.Initialise(scriptInfo);
53 scripts.Add(script.Value); 53 scripts.Add(script.Value);
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
127 { 127 {
128 MainLog.Instance.Verbose("Loading script " + script.Name); 128 MainLog.Instance.Verbose("Loading script " + script.Name);
129 ScriptInfo scriptInfo = new ScriptInfo(m_scene); 129 ScriptInfo scriptInfo = new ScriptInfo(m_scene);
130 // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script. 130 // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
131 script.Initialise(scriptInfo); 131 script.Initialise(scriptInfo);
132 scripts.Add(script); 132 scripts.Add(script);
133 133
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index c516044..f26b9a1 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
@@ -246,4 +246,4 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
246 { 246 {
247 } 247 }
248 } 248 }
249} 249} \ No newline at end of file
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 74608ef..f1d0f84 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Physics.Manager
59 public abstract Quaternion Orientation { get; set; } 59 public abstract Quaternion Orientation { get; set; }
60 60
61 public abstract bool Flying { get; set; } 61 public abstract bool Flying { get; set; }
62 62
63 public abstract bool IsColliding { get; set; } 63 public abstract bool IsColliding { get; set; }
64 64
65 public abstract bool Kinematic { get; set; } 65 public abstract bool Kinematic { get; set; }
@@ -105,6 +105,7 @@ namespace OpenSim.Region.Physics.Manager
105 get { return false; } 105 get { return false; }
106 set { return; } 106 set { return; }
107 } 107 }
108
108 public override bool IsColliding 109 public override bool IsColliding
109 { 110 {
110 get { return false; } 111 get { return false; }
@@ -127,4 +128,4 @@ namespace OpenSim.Region.Physics.Manager
127 return; 128 return;
128 } 129 }
129 } 130 }
130} 131} \ No newline at end of file
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs
index 4cb70c2..9bc6380 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Channel.cs
@@ -26,7 +26,7 @@
26* 26*
27*/ 27*/
28 28
29 /* Channel 29/* Channel
30 * A channel is a single heightmap array 30 * A channel is a single heightmap array
31 * */ 31 * */
32 32
diff --git a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
index 0ca3d48..72727d1 100644
--- a/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
+++ b/OpenSim/Region/Terrain.BasicTerrain/libTerrainBSD/Channel/Manipulators/ThermalWeathering.cs
@@ -47,7 +47,7 @@ namespace libTerrain
47 thisFrame = (double[,]) map.Clone(); 47 thisFrame = (double[,]) map.Clone();
48 48
49 NeighbourSystem type = NeighbourSystem.Moore; 49 NeighbourSystem type = NeighbourSystem.Moore;
50 // Using moore neighbourhood (twice as computationally expensive) 50 // Using moore neighbourhood (twice as computationally expensive)
51 int NEIGHBOUR_ME = 4; // I am always 4 in both systems. 51 int NEIGHBOUR_ME = 4; // I am always 4 in both systems.
52 52
53 int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5; 53 int NEIGHBOUR_MAX = type == NeighbourSystem.Moore ? 9 : 5;
generated by cgit v1.1 at 2024-11-18 21:57:58 +0000