diff options
author | Jeff Ames | 2008-05-16 01:22:11 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-16 01:22:11 +0000 |
commit | 65c5efe43b68700bad94076d4cd421160203c5de (patch) | |
tree | 589b56649ed02f4942671fd6e51c6dc43f682e0d /OpenSim/Region/Environment/Modules | |
parent | Thank you very much, mjm for : (diff) | |
download | opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.zip opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.gz opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.bz2 opensim-SC_OLD-65c5efe43b68700bad94076d4cd421160203c5de.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
28 files changed, 185 insertions, 185 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs index 48db51b..d3cf41e 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetDownload/AssetDownloadModule.cs | |||
@@ -216,7 +216,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetDownload | |||
216 | public IClientAPI RequestUser; | 216 | public IClientAPI RequestUser; |
217 | public LLUUID TransferRequestID; | 217 | public LLUUID TransferRequestID; |
218 | //public bool AssetInCache; | 218 | //public bool AssetInCache; |
219 | //public int TimeRequested; | 219 | //public int TimeRequested; |
220 | 220 | ||
221 | public AssetRequest() | 221 | public AssetRequest() |
222 | { | 222 | { |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs index bae23fa..65785af 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
40 | /// </summary> | 40 | /// </summary> |
41 | public class AgentAssetTransactions | 41 | public class AgentAssetTransactions |
42 | { | 42 | { |
43 | //private static readonly log4net.ILog m_log | 43 | //private static readonly log4net.ILog m_log |
44 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
46 | // Fields | 46 | // Fields |
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
192 | } | 192 | } |
193 | 193 | ||
194 | ourClient.SendConfirmXfer(xferID, packetID); | 194 | ourClient.SendConfirmXfer(xferID, packetID); |
195 | 195 | ||
196 | if ((packetID & 0x80000000) != 0) | 196 | if ((packetID & 0x80000000) != 0) |
197 | { | 197 | { |
198 | SendCompleteMessage(); | 198 | SendCompleteMessage(); |
@@ -209,7 +209,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
209 | /// <param name="xferID"></param> | 209 | /// <param name="xferID"></param> |
210 | /// <param name="packetID"></param> | 210 | /// <param name="packetID"></param> |
211 | /// <param name="data"></param> | 211 | /// <param name="data"></param> |
212 | /// <returns>True if the transfer is complete, false otherwise</returns> | 212 | /// <returns>True if the transfer is complete, false otherwise</returns> |
213 | public bool Initialise(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, | 213 | public bool Initialise(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, |
214 | bool storeLocal, bool tempFile) | 214 | bool storeLocal, bool tempFile) |
215 | { | 215 | { |
@@ -363,7 +363,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
363 | 363 | ||
364 | private void DoCreateItem() | 364 | private void DoCreateItem() |
365 | { | 365 | { |
366 | //really need to fix this call, if lbsa71 saw this he would die. | 366 | //really need to fix this call, if lbsa71 saw this he would die. |
367 | m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset); | 367 | m_userTransactions.Manager.MyScene.CommsManager.AssetCache.AddAsset(Asset); |
368 | CachedUserInfo userInfo = | 368 | CachedUserInfo userInfo = |
369 | m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails(ourClient.AgentId); | 369 | m_userTransactions.Manager.MyScene.CommsManager.UserProfileCacheService.GetUserDetails(ourClient.AgentId); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs index fcd0e0c..fd407d9 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
@@ -199,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
199 | 199 | ||
200 | /// <summary> | 200 | /// <summary> |
201 | /// Create an inventory item from data that has been received through a transaction. | 201 | /// Create an inventory item from data that has been received through a transaction. |
202 | /// | 202 | /// |
203 | /// This is called when new clothing or body parts are created. It may also be called in other | 203 | /// This is called when new clothing or body parts are created. It may also be called in other |
204 | /// situations. | 204 | /// situations. |
205 | /// </summary> | 205 | /// </summary> |
@@ -229,8 +229,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
229 | 229 | ||
230 | /// <summary> | 230 | /// <summary> |
231 | /// Update an inventory item with data that has been received through a transaction. | 231 | /// Update an inventory item with data that has been received through a transaction. |
232 | /// | 232 | /// |
233 | /// This is called when clothing or body parts are updated (for instance, with new textures or | 233 | /// This is called when clothing or body parts are updated (for instance, with new textures or |
234 | /// colours). It may also be called in other situations. | 234 | /// colours). It may also be called in other situations. |
235 | /// </summary> | 235 | /// </summary> |
236 | /// <param name="remoteClient"></param> | 236 | /// <param name="remoteClient"></param> |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs index 474ac75..8f81f3d 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
38 | { | 38 | { |
39 | public class TextureDownloadModule : IRegionModule | 39 | public class TextureDownloadModule : IRegionModule |
40 | { | 40 | { |
41 | //private static readonly log4net.ILog m_log | 41 | //private static readonly log4net.ILog m_log |
42 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 42 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | /// <summary> | 44 | /// <summary> |
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
212 | private void TextureSent(ITextureSender sender) | 212 | private void TextureSent(ITextureSender sender) |
213 | { | 213 | { |
214 | sender.Sending = false; | 214 | sender.Sending = false; |
215 | //m_log.DebugFormat("[TEXTURE DOWNLOAD]: Removing download stat for {0}", sender.assetID); | 215 | //m_log.DebugFormat("[TEXTURE DOWNLOAD]: Removing download stat for {0}", sender.assetID); |
216 | m_scene.AddPendingDownloads(-1); | 216 | m_scene.AddPendingDownloads(-1); |
217 | } | 217 | } |
218 | } | 218 | } |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs index 70e44d4..7c187c0 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
37 | /// </summary> | 37 | /// </summary> |
38 | public class TextureNotFoundSender : ITextureSender | 38 | public class TextureNotFoundSender : ITextureSender |
39 | { | 39 | { |
40 | //private static readonly log4net.ILog m_log | 40 | //private static readonly log4net.ILog m_log |
41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | private bool m_cancel = false; | 43 | private bool m_cancel = false; |
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
80 | public bool SendTexturePacket() | 80 | public bool SendTexturePacket() |
81 | { | 81 | { |
82 | //m_log.InfoFormat( | 82 | //m_log.InfoFormat( |
83 | // "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", | 83 | // "[TEXTURE NOT FOUND SENDER]: Informing the client that texture {0} cannot be found", |
84 | // m_textureId); | 84 | // m_textureId); |
85 | 85 | ||
86 | ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); | 86 | ImageNotInDatabasePacket notFound = new ImageNotInDatabasePacket(); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs index d4fa39f..42624ad 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// This module sets up texture senders in response to client texture requests, and places them on a | 41 | /// This module sets up texture senders in response to client texture requests, and places them on a |
42 | /// processing queue once those senders have the appropriate data (i.e. a texture retrieved from the | 42 | /// processing queue once those senders have the appropriate data (i.e. a texture retrieved from the |
43 | /// asset cache). | 43 | /// asset cache). |
44 | /// </summary> | 44 | /// </summary> |
45 | public class UserTextureDownloadService | 45 | public class UserTextureDownloadService |
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
49 | 49 | ||
50 | /// <summary> | 50 | /// <summary> |
51 | /// We will allow the client to request the same texture n times before dropping further requests | 51 | /// We will allow the client to request the same texture n times before dropping further requests |
52 | /// | 52 | /// |
53 | /// This number includes repeated requests for the same texture at different resolutions (which we don't | 53 | /// This number includes repeated requests for the same texture at different resolutions (which we don't |
54 | /// currently handle properly as far as I know). However, this situation should be handled in a more | 54 | /// currently handle properly as far as I know). However, this situation should be handled in a more |
55 | /// sophisticated way. | 55 | /// sophisticated way. |
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
80 | /// We're going to limit requests for the same missing texture. | 80 | /// We're going to limit requests for the same missing texture. |
81 | /// XXX This is really a temporary solution to deal with the situation where a client continually requests | 81 | /// XXX This is really a temporary solution to deal with the situation where a client continually requests |
82 | /// the same missing textures | 82 | /// the same missing textures |
83 | /// </summary> | 83 | /// </summary> |
84 | private readonly IRequestLimitStrategy<LLUUID> missingTextureLimitStrategy | 84 | private readonly IRequestLimitStrategy<LLUUID> missingTextureLimitStrategy |
85 | = new RepeatLimitStrategy<LLUUID>(MAX_ALLOWED_TEXTURE_REQUESTS); | 85 | = new RepeatLimitStrategy<LLUUID>(MAX_ALLOWED_TEXTURE_REQUESTS); |
86 | 86 | ||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
93 | } | 93 | } |
94 | 94 | ||
95 | /// <summary> | 95 | /// <summary> |
96 | /// Handle a texture request. This involves creating a texture sender and placing it on the | 96 | /// Handle a texture request. This involves creating a texture sender and placing it on the |
97 | /// previously passed in shared queue. | 97 | /// previously passed in shared queue. |
98 | /// </summary> | 98 | /// </summary> |
99 | /// <param name="e"></param> | 99 | /// <param name="e"></param> |
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
108 | { | 108 | { |
109 | if (m_textureSenders.TryGetValue(e.RequestedAssetID, out textureSender)) | 109 | if (m_textureSenders.TryGetValue(e.RequestedAssetID, out textureSender)) |
110 | { | 110 | { |
111 | // If we've received new non UUID information for this request and it hasn't dispatched | 111 | // If we've received new non UUID information for this request and it hasn't dispatched |
112 | // yet, then update the request accordingly. | 112 | // yet, then update the request accordingly. |
113 | textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber); | 113 | textureSender.UpdateRequest(e.DiscardLevel, e.PacketNumber); |
114 | } | 114 | } |
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
117 | if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) | 117 | if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) |
118 | { | 118 | { |
119 | // m_log.DebugFormat( | 119 | // m_log.DebugFormat( |
120 | // "[USER TEXTURE DOWNLOAD SERVICE]: Refusing request for {0} from client {1}", | 120 | // "[USER TEXTURE DOWNLOAD SERVICE]: Refusing request for {0} from client {1}", |
121 | // e.RequestedAssetID, m_client.AgentId); | 121 | // e.RequestedAssetID, m_client.AgentId); |
122 | 122 | ||
123 | return; | 123 | return; |
@@ -128,9 +128,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
128 | { | 128 | { |
129 | if (StatsManager.SimExtraStats != null) | 129 | if (StatsManager.SimExtraStats != null) |
130 | StatsManager.SimExtraStats.AddBlockedMissingTextureRequest(); | 130 | StatsManager.SimExtraStats.AddBlockedMissingTextureRequest(); |
131 | 131 | ||
132 | // Commenting out this message for now as it causes too much noise with other | 132 | // Commenting out this message for now as it causes too much noise with other |
133 | // debug messages. | 133 | // debug messages. |
134 | // m_log.DebugFormat( | 134 | // m_log.DebugFormat( |
135 | // "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", | 135 | // "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", |
136 | // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); | 136 | // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs index ea84436..be73156 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Region.Environment.Interfaces; | |||
35 | namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | 35 | namespace OpenSim.Region.Environment.Modules.Agent.TextureSender |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// A TextureSender handles the process of receiving a texture requested by the client from the | 38 | /// A TextureSender handles the process of receiving a texture requested by the client from the |
39 | /// AssetCache, and then sending that texture back to the client. | 39 | /// AssetCache, and then sending that texture back to the client. |
40 | /// </summary> | 40 | /// </summary> |
41 | public class TextureSender : ITextureSender | 41 | public class TextureSender : ITextureSender |
@@ -150,14 +150,14 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | |||
150 | { | 150 | { |
151 | if (NumPackets == 0) | 151 | if (NumPackets == 0) |
152 | { | 152 | { |
153 | 153 | ||
154 | RequestUser.SendImagePart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); | 154 | RequestUser.SendImagePart(1, m_asset.FullID, (uint)m_asset.Data.Length, m_asset.Data, 2); |
155 | 155 | ||
156 | PacketCounter++; | 156 | PacketCounter++; |
157 | } | 157 | } |
158 | else | 158 | else |
159 | { | 159 | { |
160 | 160 | ||
161 | byte[] ImageData1 = new byte[600]; | 161 | byte[] ImageData1 = new byte[600]; |
162 | Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); | 162 | Array.Copy(m_asset.Data, 0, ImageData1, 0, 600); |
163 | 163 | ||
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | |||
167 | } | 167 | } |
168 | else | 168 | else |
169 | { | 169 | { |
170 | // Doesn't like to be refactored... | 170 | // Doesn't like to be refactored... |
171 | ImagePacketPacket im = new ImagePacketPacket(); | 171 | ImagePacketPacket im = new ImagePacketPacket(); |
172 | im.Header.Reliable = false; | 172 | im.Header.Reliable = false; |
173 | im.ImageID.Packet = (ushort)(PacketCounter); | 173 | im.ImageID.Packet = (ushort)(PacketCounter); |
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs index 1b50bbd..16874d7 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.Xfer | |||
98 | } | 98 | } |
99 | 99 | ||
100 | /// <summary> | 100 | /// <summary> |
101 | /// | 101 | /// |
102 | /// </summary> | 102 | /// </summary> |
103 | /// <param name="remoteClient"></param> | 103 | /// <param name="remoteClient"></param> |
104 | /// <param name="xferID"></param> | 104 | /// <param name="xferID"></param> |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 9e5f376..a72010c 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs | |||
@@ -235,7 +235,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
235 | { | 235 | { |
236 | TrySendChatMessage(presence, fromPos, regionPos, | 236 | TrySendChatMessage(presence, fromPos, regionPos, |
237 | fromAgentID, fromName, e.Type, message, ChatSourceType.Agent); | 237 | fromAgentID, fromName, e.Type, message, ChatSourceType.Agent); |
238 | 238 | ||
239 | } | 239 | } |
240 | }); | 240 | }); |
241 | } | 241 | } |
@@ -572,7 +572,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
572 | string regex = @":(?<nick>\w*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)"; | 572 | string regex = @":(?<nick>\w*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)"; |
573 | Regex RE = new Regex(regex, RegexOptions.Multiline); | 573 | Regex RE = new Regex(regex, RegexOptions.Multiline); |
574 | MatchCollection matches = RE.Matches(input); | 574 | MatchCollection matches = RE.Matches(input); |
575 | // Get some direct matches $1 $4 is a | 575 | // Get some direct matches $1 $4 is a |
576 | if ((matches.Count == 1) && (matches[0].Groups.Count == 5)) | 576 | if ((matches.Count == 1) && (matches[0].Groups.Count == 5)) |
577 | { | 577 | { |
578 | result = new Dictionary<string, string>(); | 578 | result = new Dictionary<string, string>(); |
@@ -703,7 +703,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
703 | 703 | ||
704 | public void ProcessIRCCommand(string command) | 704 | public void ProcessIRCCommand(string command) |
705 | { | 705 | { |
706 | //m_log.Info("[IRC]: ProcessIRCCommand:" + command); | 706 | //m_log.Info("[IRC]: ProcessIRCCommand:" + command); |
707 | 707 | ||
708 | string[] commArgs = new string[command.Split(' ').Length]; | 708 | string[] commArgs = new string[command.Split(' ').Length]; |
709 | string c_server = m_server; | 709 | string c_server = m_server; |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index c63fc93..fab546b 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs | |||
@@ -46,10 +46,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
46 | /// Demo Economy/Money Module. This is not a production quality money/economy module! | 46 | /// Demo Economy/Money Module. This is not a production quality money/economy module! |
47 | /// This is a demo for you to use when making one that works for you. | 47 | /// This is a demo for you to use when making one that works for you. |
48 | /// // To use the following you need to add: | 48 | /// // To use the following you need to add: |
49 | /// -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> | 49 | /// -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> |
50 | /// to the command line parameters you use to start up your client | 50 | /// to the command line parameters you use to start up your client |
51 | /// This commonly looks like -helperuri http://127.0.0.1:9000/ | 51 | /// This commonly looks like -helperuri http://127.0.0.1:9000/ |
52 | /// | 52 | /// |
53 | /// Centralized grid structure example using OpenSimWi Redux revision 9+ | 53 | /// Centralized grid structure example using OpenSimWi Redux revision 9+ |
54 | /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux | 54 | /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux |
55 | /// </summary> | 55 | /// </summary> |
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
147 | XMLRPCHandler = scene; | 147 | XMLRPCHandler = scene; |
148 | 148 | ||
149 | // To use the following you need to add: | 149 | // To use the following you need to add: |
150 | // -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> | 150 | // -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> |
151 | // to the command line parameters you use to start up your client | 151 | // to the command line parameters you use to start up your client |
152 | // This commonly looks like -helperuri http://127.0.0.1:9000/ | 152 | // This commonly looks like -helperuri http://127.0.0.1:9000/ |
153 | 153 | ||
@@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
276 | private void OnNewClient(IClientAPI client) | 276 | private void OnNewClient(IClientAPI client) |
277 | { | 277 | { |
278 | // Here we check if we're in grid mode | 278 | // Here we check if we're in grid mode |
279 | // I imagine that the 'check balance' | 279 | // I imagine that the 'check balance' |
280 | // function for the client should be here or shortly after | 280 | // function for the client should be here or shortly after |
281 | 281 | ||
282 | if (gridmode) | 282 | if (gridmode) |
@@ -367,7 +367,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
367 | { | 367 | { |
368 | lock (m_KnownClientFunds) | 368 | lock (m_KnownClientFunds) |
369 | { | 369 | { |
370 | // If we don't know about the sender, then the sender can't | 370 | // If we don't know about the sender, then the sender can't |
371 | // actually be here and therefore this is likely fraud or outdated. | 371 | // actually be here and therefore this is likely fraud or outdated. |
372 | if (m_MoneyAddress.Length == 0) | 372 | if (m_MoneyAddress.Length == 0) |
373 | { | 373 | { |
@@ -1394,7 +1394,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
1394 | 1394 | ||
1395 | 1395 | ||
1396 | m_rootAgents[avatar.UUID] = avatar.Scene.RegionInfo.originRegionID; | 1396 | m_rootAgents[avatar.UUID] = avatar.Scene.RegionInfo.originRegionID; |
1397 | 1397 | ||
1398 | 1398 | ||
1399 | //m_log.Info("[MONEY]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); | 1399 | //m_log.Info("[MONEY]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); |
1400 | // Claim User! my user! Mine mine mine! | 1400 | // Claim User! my user! Mine mine mine! |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs index 8c96392..c82f88d 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs | |||
@@ -97,9 +97,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
97 | private void OnNewClient(IClientAPI client) | 97 | private void OnNewClient(IClientAPI client) |
98 | { | 98 | { |
99 | // All friends establishment protocol goes over instant message | 99 | // All friends establishment protocol goes over instant message |
100 | // There's no way to send a message from the sim | 100 | // There's no way to send a message from the sim |
101 | // to a user to 'add a friend' without causing dialog box spam | 101 | // to a user to 'add a friend' without causing dialog box spam |
102 | // | 102 | // |
103 | // The base set of friends are added when the user signs on in their XMLRPC response | 103 | // The base set of friends are added when the user signs on in their XMLRPC response |
104 | // Generated by LoginService. The friends are retreived from the database by the UserManager | 104 | // Generated by LoginService. The friends are retreived from the database by the UserManager |
105 | 105 | ||
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
167 | LLUUID[] Agents = new LLUUID[1]; | 167 | LLUUID[] Agents = new LLUUID[1]; |
168 | Agents[0] = client.AgentId; | 168 | Agents[0] = client.AgentId; |
169 | av.ControllingClient.SendAgentOnline(Agents); | 169 | av.ControllingClient.SendAgentOnline(Agents); |
170 | 170 | ||
171 | } | 171 | } |
172 | } | 172 | } |
173 | } | 173 | } |
@@ -223,14 +223,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
223 | } | 223 | } |
224 | catch (IndexOutOfRangeException) | 224 | catch (IndexOutOfRangeException) |
225 | { | 225 | { |
226 | // Ignore the index out of range exception. | 226 | // Ignore the index out of range exception. |
227 | // This causes friend lists to get out of sync slightly.. however | 227 | // This causes friend lists to get out of sync slightly.. however |
228 | // prevents a sim crash. | 228 | // prevents a sim crash. |
229 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); | 229 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); |
230 | } | 230 | } |
231 | catch (ArgumentOutOfRangeException) | 231 | catch (ArgumentOutOfRangeException) |
232 | { | 232 | { |
233 | // Ignore the index out of range exception. | 233 | // Ignore the index out of range exception. |
234 | // This causes friend lists to get out of sync slightly.. however | 234 | // This causes friend lists to get out of sync slightly.. however |
235 | // prevents a sim crash. | 235 | // prevents a sim crash. |
236 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); | 236 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); |
@@ -248,14 +248,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
248 | 248 | ||
249 | catch (IndexOutOfRangeException) | 249 | catch (IndexOutOfRangeException) |
250 | { | 250 | { |
251 | // Ignore the index out of range exception. | 251 | // Ignore the index out of range exception. |
252 | // This causes friend lists to get out of sync slightly.. however | 252 | // This causes friend lists to get out of sync slightly.. however |
253 | // prevents a sim crash. | 253 | // prevents a sim crash. |
254 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); | 254 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); |
255 | } | 255 | } |
256 | catch (ArgumentOutOfRangeException) | 256 | catch (ArgumentOutOfRangeException) |
257 | { | 257 | { |
258 | // Ignore the index out of range exception. | 258 | // Ignore the index out of range exception. |
259 | // This causes friend lists to get out of sync slightly.. however | 259 | // This causes friend lists to get out of sync slightly.. however |
260 | // prevents a sim crash. | 260 | // prevents a sim crash. |
261 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); | 261 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); |
@@ -411,10 +411,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
411 | { | 411 | { |
412 | if (m_pendingFriendRequests.ContainsKey(transactionID)) | 412 | if (m_pendingFriendRequests.ContainsKey(transactionID)) |
413 | { | 413 | { |
414 | // Found Pending Friend Request with that Transaction.. | 414 | // Found Pending Friend Request with that Transaction.. |
415 | Scene SceneAgentIn = m_scene[0]; | 415 | Scene SceneAgentIn = m_scene[0]; |
416 | 416 | ||
417 | // Found Pending Friend Request with that Transaction.. | 417 | // Found Pending Friend Request with that Transaction.. |
418 | ScenePresence agentpresence = GetPresenceFromAgentID(agentID); | 418 | ScenePresence agentpresence = GetPresenceFromAgentID(agentID); |
419 | if (agentpresence != null) | 419 | if (agentpresence != null) |
420 | { | 420 | { |
@@ -453,7 +453,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
453 | { | 453 | { |
454 | Scene SceneAgentIn = m_scene[0]; | 454 | Scene SceneAgentIn = m_scene[0]; |
455 | 455 | ||
456 | // Found Pending Friend Request with that Transaction.. | 456 | // Found Pending Friend Request with that Transaction.. |
457 | ScenePresence agentpresence = GetPresenceFromAgentID(agentID); | 457 | ScenePresence agentpresence = GetPresenceFromAgentID(agentID); |
458 | if (agentpresence != null) | 458 | if (agentpresence != null) |
459 | { | 459 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs index 624f307..e1cc688 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory | |||
107 | 107 | ||
108 | // First byte of the array is probably the item type | 108 | // First byte of the array is probably the item type |
109 | // Next 16 bytes are the UUID | 109 | // Next 16 bytes are the UUID |
110 | //Array.Copy(binaryBucket, 1, rawId, 0, 16); | 110 | //Array.Copy(binaryBucket, 1, rawId, 0, 16); |
111 | 111 | ||
112 | //LLUUID itemId = new LLUUID(new Guid(rawId)); | 112 | //LLUUID itemId = new LLUUID(new Guid(rawId)); |
113 | LLUUID itemId = new LLUUID(binaryBucket, 1); | 113 | LLUUID itemId = new LLUUID(binaryBucket, 1); |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs index 15825b6..2e2be7a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles | |||
86 | } | 86 | } |
87 | 87 | ||
88 | /// <summary> | 88 | /// <summary> |
89 | /// | 89 | /// |
90 | /// </summary> | 90 | /// </summary> |
91 | /// <param name="remoteClient"></param> | 91 | /// <param name="remoteClient"></param> |
92 | /// <param name="avatarID"></param> | 92 | /// <param name="avatarID"></param> |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index 2112f91..f8651a3 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs | |||
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice | |||
226 | public string ProvisionVoiceAccountRequest(string request, string path, string param, | 226 | public string ProvisionVoiceAccountRequest(string request, string path, string param, |
227 | LLUUID agentID, Caps caps) | 227 | LLUUID agentID, Caps caps) |
228 | { | 228 | { |
229 | // we need to | 229 | // we need to |
230 | // - get user data from UserProfileCacheService | 230 | // - get user data from UserProfileCacheService |
231 | // - generate nonce for user voice account password | 231 | // - generate nonce for user voice account password |
232 | // - issue XmlRpc request to asterisk opensim front end: | 232 | // - issue XmlRpc request to asterisk opensim front end: |
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs index e1339a3..87ecfee 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -40,25 +40,25 @@ using OpenSim.Region.Environment.Scenes; | |||
40 | /***************************************************** | 40 | /***************************************************** |
41 | * | 41 | * |
42 | * ScriptsHttpRequests | 42 | * ScriptsHttpRequests |
43 | * | 43 | * |
44 | * Implements the llHttpRequest and http_response | 44 | * Implements the llHttpRequest and http_response |
45 | * callback. | 45 | * callback. |
46 | * | 46 | * |
47 | * Some stuff was already in LSLLongCmdHandler, and then | 47 | * Some stuff was already in LSLLongCmdHandler, and then |
48 | * there was this file with a stub class in it. So, | 48 | * there was this file with a stub class in it. So, |
49 | * I am moving some of the objects and functions out of | 49 | * I am moving some of the objects and functions out of |
50 | * LSLLongCmdHandler, such as the HttpRequestClass, the | 50 | * LSLLongCmdHandler, such as the HttpRequestClass, the |
51 | * start and stop methods, and setting up pending and | 51 | * start and stop methods, and setting up pending and |
52 | * completed queues. These are processed in the | 52 | * completed queues. These are processed in the |
53 | * LSLLongCmdHandler polling loop. Similiar to the | 53 | * LSLLongCmdHandler polling loop. Similiar to the |
54 | * XMLRPCModule, since that seems to work. | 54 | * XMLRPCModule, since that seems to work. |
55 | * | 55 | * |
56 | * //TODO | 56 | * //TODO |
57 | * | 57 | * |
58 | * This probably needs some throttling mechanism but | 58 | * This probably needs some throttling mechanism but |
59 | * its wide open right now. This applies to both | 59 | * its wide open right now. This applies to both |
60 | * number of requests and data volume. | 60 | * number of requests and data volume. |
61 | * | 61 | * |
62 | * Linden puts all kinds of header fields in the requests. | 62 | * Linden puts all kinds of header fields in the requests. |
63 | * Not doing any of that: | 63 | * Not doing any of that: |
64 | * User-Agent | 64 | * User-Agent |
@@ -71,13 +71,13 @@ using OpenSim.Region.Environment.Scenes; | |||
71 | * X-SecondLife-Local-Rotation | 71 | * X-SecondLife-Local-Rotation |
72 | * X-SecondLife-Owner-Name | 72 | * X-SecondLife-Owner-Name |
73 | * X-SecondLife-Owner-Key | 73 | * X-SecondLife-Owner-Key |
74 | * | 74 | * |
75 | * HTTPS support | 75 | * HTTPS support |
76 | * | 76 | * |
77 | * Configurable timeout? | 77 | * Configurable timeout? |
78 | * Configurable max repsonse size? | 78 | * Configurable max repsonse size? |
79 | * Configurable | 79 | * Configurable |
80 | * | 80 | * |
81 | * **************************************************/ | 81 | * **************************************************/ |
82 | 82 | ||
83 | namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest | 83 | namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest |
diff --git a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs index 626c60f..bbd4fa3 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/VectorRender/VectorRenderModule.cs | |||
@@ -226,7 +226,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.VectorRender | |||
226 | foreach (string line in lines) | 226 | foreach (string line in lines) |
227 | { | 227 | { |
228 | string nextLine = line.Trim(); | 228 | string nextLine = line.Trim(); |
229 | //replace with switch, or even better, do some proper parsing | 229 | //replace with switch, or even better, do some proper parsing |
230 | if (nextLine.StartsWith("MoveTo")) | 230 | if (nextLine.StartsWith("MoveTo")) |
231 | { | 231 | { |
232 | float x = 0; | 232 | float x = 0; |
diff --git a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs index 7a15708..4ed0fb5 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs | |||
@@ -37,25 +37,25 @@ using OpenSim.Region.Environment.Scenes; | |||
37 | /***************************************************** | 37 | /***************************************************** |
38 | * | 38 | * |
39 | * WorldCommModule | 39 | * WorldCommModule |
40 | * | 40 | * |
41 | * | 41 | * |
42 | * Holding place for world comms - basically llListen | 42 | * Holding place for world comms - basically llListen |
43 | * function implementation. | 43 | * function implementation. |
44 | * | 44 | * |
45 | * lLListen(integer channel, string name, key id, string msg) | 45 | * lLListen(integer channel, string name, key id, string msg) |
46 | * The name, id, and msg arguments specify the filtering | 46 | * The name, id, and msg arguments specify the filtering |
47 | * criteria. You can pass the empty string | 47 | * criteria. You can pass the empty string |
48 | * (or NULL_KEY for id) for these to set a completely | 48 | * (or NULL_KEY for id) for these to set a completely |
49 | * open filter; this causes the listen() event handler to be | 49 | * open filter; this causes the listen() event handler to be |
50 | * invoked for all chat on the channel. To listen only | 50 | * invoked for all chat on the channel. To listen only |
51 | * for chat spoken by a specific object or avatar, | 51 | * for chat spoken by a specific object or avatar, |
52 | * specify the name and/or id arguments. To listen | 52 | * specify the name and/or id arguments. To listen |
53 | * only for a specific command, specify the | 53 | * only for a specific command, specify the |
54 | * (case-sensitive) msg argument. If msg is not empty, | 54 | * (case-sensitive) msg argument. If msg is not empty, |
55 | * listener will only hear strings which are exactly equal | 55 | * listener will only hear strings which are exactly equal |
56 | * to msg. You can also use all the arguments to establish | 56 | * to msg. You can also use all the arguments to establish |
57 | * the most restrictive filtering criteria. | 57 | * the most restrictive filtering criteria. |
58 | * | 58 | * |
59 | * It might be useful for each listener to maintain a message | 59 | * It might be useful for each listener to maintain a message |
60 | * digest, with a list of recent messages by UUID. This can | 60 | * digest, with a list of recent messages by UUID. This can |
61 | * be used to prevent in-world repeater loops. However, the | 61 | * be used to prevent in-world repeater loops. However, the |
@@ -76,7 +76,7 @@ using OpenSim.Region.Environment.Scenes; | |||
76 | * Might be actually easier to map the global handle into | 76 | * Might be actually easier to map the global handle into |
77 | * script-local handle in the ScriptEngine. Not sure if its | 77 | * script-local handle in the ScriptEngine. Not sure if its |
78 | * worth the effort tho. | 78 | * worth the effort tho. |
79 | * | 79 | * |
80 | * **************************************************/ | 80 | * **************************************************/ |
81 | 81 | ||
82 | namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm | 82 | namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm |
@@ -317,9 +317,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm | |||
317 | } | 317 | } |
318 | 318 | ||
319 | /******************************************************************** | 319 | /******************************************************************** |
320 | * | 320 | * |
321 | * Listener Stuff | 321 | * Listener Stuff |
322 | * | 322 | * |
323 | * *****************************************************************/ | 323 | * *****************************************************************/ |
324 | 324 | ||
325 | private void DeliverClientMessage(Object sender, ChatFromViewerArgs e) | 325 | private void DeliverClientMessage(Object sender, ChatFromViewerArgs e) |
diff --git a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs index a039d42..9d4e0fa 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs | |||
@@ -43,12 +43,12 @@ using OpenSim.Region.Environment.Scenes; | |||
43 | /***************************************************** | 43 | /***************************************************** |
44 | * | 44 | * |
45 | * XMLRPCModule | 45 | * XMLRPCModule |
46 | * | 46 | * |
47 | * Module for accepting incoming communications from | 47 | * Module for accepting incoming communications from |
48 | * external XMLRPC client and calling a remote data | 48 | * external XMLRPC client and calling a remote data |
49 | * procedure for a registered data channel/prim. | 49 | * procedure for a registered data channel/prim. |
50 | * | 50 | * |
51 | * | 51 | * |
52 | * 1. On module load, open a listener port | 52 | * 1. On module load, open a listener port |
53 | * 2. Attach an XMLRPC handler | 53 | * 2. Attach an XMLRPC handler |
54 | * 3. When a request is received: | 54 | * 3. When a request is received: |
@@ -59,18 +59,18 @@ using OpenSim.Region.Environment.Scenes; | |||
59 | * 3.5 Return response to client caller | 59 | * 3.5 Return response to client caller |
60 | * 3.6 If no response from llRemoteDataReply within | 60 | * 3.6 If no response from llRemoteDataReply within |
61 | * RemoteReplyScriptTimeout, generate script timeout fault | 61 | * RemoteReplyScriptTimeout, generate script timeout fault |
62 | * | 62 | * |
63 | * Prims in script must: | 63 | * Prims in script must: |
64 | * 1. Open a remote data channel | 64 | * 1. Open a remote data channel |
65 | * 1.1 Generate a channel ID | 65 | * 1.1 Generate a channel ID |
66 | * 1.2 Register primid,channelid pair with module | 66 | * 1.2 Register primid,channelid pair with module |
67 | * 2. Implement the remote data procedure handler | 67 | * 2. Implement the remote data procedure handler |
68 | * | 68 | * |
69 | * llOpenRemoteDataChannel | 69 | * llOpenRemoteDataChannel |
70 | * llRemoteDataReply | 70 | * llRemoteDataReply |
71 | * remote_data(integer type, key channel, key messageid, string sender, integer ival, string sval) | 71 | * remote_data(integer type, key channel, key messageid, string sender, integer ival, string sval) |
72 | * llCloseRemoteDataChannel | 72 | * llCloseRemoteDataChannel |
73 | * | 73 | * |
74 | * **************************************************/ | 74 | * **************************************************/ |
75 | 75 | ||
76 | namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC | 76 | namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC |
@@ -157,16 +157,16 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC | |||
157 | 157 | ||
158 | /********************************************** | 158 | /********************************************** |
159 | * OpenXMLRPCChannel | 159 | * OpenXMLRPCChannel |
160 | * | 160 | * |
161 | * Generate a LLUUID channel key and add it and | 161 | * Generate a LLUUID channel key and add it and |
162 | * the prim id to dictionary <channelUUID, primUUID> | 162 | * the prim id to dictionary <channelUUID, primUUID> |
163 | * | 163 | * |
164 | * First check if there is a channel assigned for | 164 | * First check if there is a channel assigned for |
165 | * this itemID. If there is, then someone called | 165 | * this itemID. If there is, then someone called |
166 | * llOpenRemoteDataChannel twice. Just return the | 166 | * llOpenRemoteDataChannel twice. Just return the |
167 | * original channel. Other option is to delete the | 167 | * original channel. Other option is to delete the |
168 | * current channel and assign a new one. | 168 | * current channel and assign a new one. |
169 | * | 169 | * |
170 | * ********************************************/ | 170 | * ********************************************/ |
171 | 171 | ||
172 | public LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID) | 172 | public LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID) |
@@ -224,9 +224,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC | |||
224 | 224 | ||
225 | /********************************************** | 225 | /********************************************** |
226 | * Remote Data Reply | 226 | * Remote Data Reply |
227 | * | 227 | * |
228 | * Response to RPC message | 228 | * Response to RPC message |
229 | * | 229 | * |
230 | *********************************************/ | 230 | *********************************************/ |
231 | 231 | ||
232 | public void RemoteDataReply(string channel, string message_id, string sdata, int idata) | 232 | public void RemoteDataReply(string channel, string message_id, string sdata, int idata) |
@@ -245,9 +245,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC | |||
245 | 245 | ||
246 | /********************************************** | 246 | /********************************************** |
247 | * CloseXMLRPCChannel | 247 | * CloseXMLRPCChannel |
248 | * | 248 | * |
249 | * Remove channel from dictionary | 249 | * Remove channel from dictionary |
250 | * | 250 | * |
251 | *********************************************/ | 251 | *********************************************/ |
252 | 252 | ||
253 | public void CloseXMLRPCChannel(LLUUID channelKey) | 253 | public void CloseXMLRPCChannel(LLUUID channelKey) |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs index b5d5e6e..82341a9 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandChannel.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
41 | #region Constants | 41 | #region Constants |
42 | 42 | ||
43 | //Land types set with flags in ParcelOverlay. | 43 | //Land types set with flags in ParcelOverlay. |
44 | //Only one of these can be used. | 44 | //Only one of these can be used. |
45 | public const float BAN_LINE_SAFETY_HIEGHT = 100; | 45 | public const float BAN_LINE_SAFETY_HIEGHT = 100; |
46 | public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = 128; //Equals 10000000 | 46 | public const byte LAND_FLAG_PROPERTY_BORDER_SOUTH = 128; //Equals 10000000 |
47 | public const byte LAND_FLAG_PROPERTY_BORDER_WEST = 64; //Equals 01000000 | 47 | public const byte LAND_FLAG_PROPERTY_BORDER_WEST = 64; //Equals 01000000 |
@@ -584,7 +584,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
584 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) | 584 | if (byteArrayCount >= LAND_BLOCKS_PER_PACKET) |
585 | { | 585 | { |
586 | remote_client.sendLandParcelOverlay(byteArray, sequenceID); | 586 | remote_client.sendLandParcelOverlay(byteArray, sequenceID); |
587 | byteArrayCount = 0; | 587 | byteArrayCount = 0; |
588 | sequenceID++; | 588 | sequenceID++; |
589 | byteArray = new byte[LAND_BLOCKS_PER_PACKET]; | 589 | byteArray = new byte[LAND_BLOCKS_PER_PACKET]; |
590 | } | 590 | } |
@@ -655,7 +655,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
655 | 655 | ||
656 | public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client) | 656 | public void handleParcelSelectObjectsRequest(int local_id, int request_type, IClientAPI remote_client) |
657 | { | 657 | { |
658 | 658 | ||
659 | landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client); | 659 | landList[local_id].sendForceObjectSelect(local_id, request_type, remote_client); |
660 | } | 660 | } |
661 | 661 | ||
@@ -870,7 +870,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
870 | } | 870 | } |
871 | 871 | ||
872 | public void handleAnyClientMovement(ScenePresence avatar) | 872 | public void handleAnyClientMovement(ScenePresence avatar) |
873 | //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. | 873 | //Like handleSignificantClientMovement, but called with an AgentUpdate regardless of distance. |
874 | { | 874 | { |
875 | ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 875 | ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
876 | if (over != null) | 876 | if (over != null) |
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs index b319370..54870d8 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs | |||
@@ -622,7 +622,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
622 | /// <summary> | 622 | /// <summary> |
623 | /// Notify the parcel owner each avatar that owns prims situated on their land. This notification includes | 623 | /// Notify the parcel owner each avatar that owns prims situated on their land. This notification includes |
624 | /// aggreagete details such as the number of prims. | 624 | /// aggreagete details such as the number of prims. |
625 | /// | 625 | /// |
626 | /// </summary> | 626 | /// </summary> |
627 | /// <param name="remote_client"> | 627 | /// <param name="remote_client"> |
628 | /// A <see cref="IClientAPI"/> | 628 | /// A <see cref="IClientAPI"/> |
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index d31a250..43e8f36 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
47 | 47 | ||
48 | #region Constants | 48 | #region Constants |
49 | // These are here for testing. They will be taken out | 49 | // These are here for testing. They will be taken out |
50 | 50 | ||
51 | //private uint PERM_ALL = (uint)2147483647; | 51 | //private uint PERM_ALL = (uint)2147483647; |
52 | private uint PERM_COPY = (uint)32768; | 52 | private uint PERM_COPY = (uint)32768; |
53 | //private uint PERM_MODIFY = (uint)16384; | 53 | //private uint PERM_MODIFY = (uint)16384; |
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
59 | 59 | ||
60 | #region Bypass Permissions / Debug Permissions Stuff | 60 | #region Bypass Permissions / Debug Permissions Stuff |
61 | 61 | ||
62 | // Bypasses the permissions engine | 62 | // Bypasses the permissions engine |
63 | private bool m_bypassPermissions = false; | 63 | private bool m_bypassPermissions = false; |
64 | private bool m_bypassPermissionsValue = true; | 64 | private bool m_bypassPermissionsValue = true; |
65 | private bool m_debugPermissions = false; | 65 | private bool m_debugPermissions = false; |
@@ -126,18 +126,18 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
126 | public void Initialise(Scene scene, IConfigSource config) | 126 | public void Initialise(Scene scene, IConfigSource config) |
127 | { | 127 | { |
128 | m_scene = scene; | 128 | m_scene = scene; |
129 | 129 | ||
130 | IConfig myConfig = config.Configs["Startup"]; | 130 | IConfig myConfig = config.Configs["Startup"]; |
131 | |||
132 | string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule"); | ||
133 | 131 | ||
134 | List<string> modules=new List<string>(permissionModules.Split(',')); | 132 | string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule"); |
133 | |||
134 | List<string> modules=new List<string>(permissionModules.Split(',')); | ||
135 | 135 | ||
136 | if(!modules.Contains("DefaultPermissionsModule")) | 136 | if (!modules.Contains("DefaultPermissionsModule")) |
137 | return; | 137 | return; |
138 | |||
139 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); | ||
138 | 140 | ||
139 | m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true); | ||
140 | |||
141 | m_scene.RegisterModuleInterface<IScenePermissions>(this); | 141 | m_scene.RegisterModuleInterface<IScenePermissions>(this); |
142 | 142 | ||
143 | //Register functions with Scene External Checks! | 143 | //Register functions with Scene External Checks! |
@@ -212,7 +212,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
212 | get { return false; } | 212 | get { return false; } |
213 | } | 213 | } |
214 | 214 | ||
215 | #endregion | 215 | #endregion |
216 | 216 | ||
217 | #region Helper Functions | 217 | #region Helper Functions |
218 | protected void SendPermissionError(LLUUID user, string reason) | 218 | protected void SendPermissionError(LLUUID user, string reason) |
@@ -252,38 +252,38 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
252 | } | 252 | } |
253 | #endregion | 253 | #endregion |
254 | 254 | ||
255 | public bool PropagatePermissions() | 255 | public bool PropagatePermissions() |
256 | { | 256 | { |
257 | return false; | 257 | return false; |
258 | } | 258 | } |
259 | 259 | ||
260 | public bool BypassPermissions() | 260 | public bool BypassPermissions() |
261 | { | 261 | { |
262 | return m_bypassPermissions; | 262 | return m_bypassPermissions; |
263 | } | 263 | } |
264 | 264 | ||
265 | public void SetBypassPermissions(bool value) | 265 | public void SetBypassPermissions(bool value) |
266 | { | 266 | { |
267 | m_bypassPermissions=value; | 267 | m_bypassPermissions=value; |
268 | } | 268 | } |
269 | 269 | ||
270 | #region Object Permissions | 270 | #region Object Permissions |
271 | 271 | ||
272 | public uint GenerateClientFlags(LLUUID user, LLUUID objID) | 272 | public uint GenerateClientFlags(LLUUID user, LLUUID objID) |
273 | { | 273 | { |
274 | // Here's the way this works, | 274 | // Here's the way this works, |
275 | // ObjectFlags and Permission flags are two different enumerations | 275 | // ObjectFlags and Permission flags are two different enumerations |
276 | // ObjectFlags, however, tells the client to change what it will allow the user to do. | 276 | // ObjectFlags, however, tells the client to change what it will allow the user to do. |
277 | // So, that means that all of the permissions type ObjectFlags are /temporary/ and only | 277 | // So, that means that all of the permissions type ObjectFlags are /temporary/ and only |
278 | // supposed to be set when customizing the objectflags for the client. | 278 | // supposed to be set when customizing the objectflags for the client. |
279 | 279 | ||
280 | // These temporary objectflags get computed and added in this function based on the | 280 | // These temporary objectflags get computed and added in this function based on the |
281 | // Permission mask that's appropriate! | 281 | // Permission mask that's appropriate! |
282 | // Outside of this method, they should never be added to objectflags! | 282 | // Outside of this method, they should never be added to objectflags! |
283 | // -teravus | 283 | // -teravus |
284 | 284 | ||
285 | SceneObjectPart task=m_scene.GetSceneObjectPart(objID); | 285 | SceneObjectPart task=m_scene.GetSceneObjectPart(objID); |
286 | 286 | ||
287 | // this shouldn't ever happen.. return no permissions/objectflags. | 287 | // this shouldn't ever happen.. return no permissions/objectflags. |
288 | if (task == null) | 288 | if (task == null) |
289 | return (uint)0; | 289 | return (uint)0; |
@@ -292,7 +292,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
292 | LLUUID objectOwner = task.OwnerID; | 292 | LLUUID objectOwner = task.OwnerID; |
293 | 293 | ||
294 | 294 | ||
295 | // Remove any of the objectFlags that are temporary. These will get added back if appropriate | 295 | // Remove any of the objectFlags that are temporary. These will get added back if appropriate |
296 | // in the next bit of code | 296 | // in the next bit of code |
297 | 297 | ||
298 | objflags &= (uint) | 298 | objflags &= (uint) |
@@ -354,7 +354,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
354 | 354 | ||
355 | private uint ApplyObjectModifyMasks(uint setPermissionMask, uint objectFlagsMask) | 355 | private uint ApplyObjectModifyMasks(uint setPermissionMask, uint objectFlagsMask) |
356 | { | 356 | { |
357 | // We are adding the temporary objectflags to the object's objectflags based on the | 357 | // We are adding the temporary objectflags to the object's objectflags based on the |
358 | // permission flag given. These change the F flags on the client. | 358 | // permission flag given. These change the F flags on the client. |
359 | 359 | ||
360 | if ((setPermissionMask & (uint)PermissionMask.Copy) != 0) | 360 | if ((setPermissionMask & (uint)PermissionMask.Copy) != 0) |
@@ -404,7 +404,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
404 | locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0); | 404 | locked = ((group.RootPart.OwnerMask & PERM_LOCKED) == 0); |
405 | 405 | ||
406 | // People shouldn't be able to do anything with locked objects, except the Administrator | 406 | // People shouldn't be able to do anything with locked objects, except the Administrator |
407 | // The 'set permissions' runs through a different permission check, so when an object owner | 407 | // The 'set permissions' runs through a different permission check, so when an object owner |
408 | // sets an object locked, the only thing that they can do is unlock it. | 408 | // sets an object locked, the only thing that they can do is unlock it. |
409 | // | 409 | // |
410 | // Nobody but the object owner can set permissions on an object | 410 | // Nobody but the object owner can set permissions on an object |
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
458 | bool permission = false; | 458 | bool permission = false; |
459 | string reason = "Only registered users may communicate with another account."; | 459 | string reason = "Only registered users may communicate with another account."; |
460 | 460 | ||
461 | 461 | ||
462 | if (IsAdministrator(user)) | 462 | if (IsAdministrator(user)) |
463 | permission = true; | 463 | permission = true; |
464 | 464 | ||
@@ -521,7 +521,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
521 | return GenericParcelPermission(user, parcel); | 521 | return GenericParcelPermission(user, parcel); |
522 | } | 522 | } |
523 | #endregion | 523 | #endregion |
524 | 524 | ||
525 | #region Permission Checks | 525 | #region Permission Checks |
526 | private bool CanAbandonParcel(LLUUID user, ILandObject parcel, Scene scene) | 526 | private bool CanAbandonParcel(LLUUID user, ILandObject parcel, Scene scene) |
527 | { | 527 | { |
@@ -607,7 +607,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
607 | { | 607 | { |
608 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 608 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
609 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 609 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
610 | 610 | ||
611 | return GenericCommunicationPermission(user, target); | 611 | return GenericCommunicationPermission(user, target); |
612 | } | 612 | } |
613 | 613 | ||
@@ -632,8 +632,8 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
632 | return false; | 632 | return false; |
633 | } | 633 | } |
634 | 634 | ||
635 | // The client | 635 | // The client |
636 | // may request to edit linked parts, and therefore, it needs | 636 | // may request to edit linked parts, and therefore, it needs |
637 | // to also check for SceneObjectPart | 637 | // to also check for SceneObjectPart |
638 | 638 | ||
639 | // If it's not an object, we cant edit it. | 639 | // If it's not an object, we cant edit it. |
@@ -647,7 +647,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
647 | 647 | ||
648 | 648 | ||
649 | LLUUID taskOwner = null; | 649 | LLUUID taskOwner = null; |
650 | // Added this because at this point in time it wouldn't be wise for | 650 | // Added this because at this point in time it wouldn't be wise for |
651 | // the administrator object permissions to take effect. | 651 | // the administrator object permissions to take effect. |
652 | LLUUID objectOwner = task.OwnerID; | 652 | LLUUID objectOwner = task.OwnerID; |
653 | 653 | ||
@@ -682,12 +682,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
682 | 682 | ||
683 | 683 | ||
684 | // This is an exception to the generic object permission. | 684 | // This is an exception to the generic object permission. |
685 | // Administrators who lock their objects should not be able to move them, | 685 | // Administrators who lock their objects should not be able to move them, |
686 | // however generic object permission should return true. | 686 | // however generic object permission should return true. |
687 | // This keeps locked objects from being affected by random click + drag actions by accident | 687 | // This keeps locked objects from being affected by random click + drag actions by accident |
688 | // and allows the administrator to grab or delete a locked object. | 688 | // and allows the administrator to grab or delete a locked object. |
689 | 689 | ||
690 | // Administrators and estate managers are still able to click+grab locked objects not | 690 | // Administrators and estate managers are still able to click+grab locked objects not |
691 | // owned by them in the scene | 691 | // owned by them in the scene |
692 | // This is by design. | 692 | // This is by design. |
693 | 693 | ||
@@ -834,7 +834,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
834 | 834 | ||
835 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; | 835 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objectID]; |
836 | LLUUID taskOwner = null; | 836 | LLUUID taskOwner = null; |
837 | // Added this because at this point in time it wouldn't be wise for | 837 | // Added this because at this point in time it wouldn't be wise for |
838 | // the administrator object permissions to take effect. | 838 | // the administrator object permissions to take effect. |
839 | LLUUID objectOwner = task.OwnerID; | 839 | LLUUID objectOwner = task.OwnerID; |
840 | 840 | ||
@@ -895,61 +895,61 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
895 | 895 | ||
896 | #endregion | 896 | #endregion |
897 | 897 | ||
898 | public bool CanLinkObject(LLUUID userID, LLUUID objectID) | 898 | public bool CanLinkObject(LLUUID userID, LLUUID objectID) |
899 | { | 899 | { |
900 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 900 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
901 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 901 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
902 | 902 | ||
903 | return true; | 903 | return true; |
904 | } | 904 | } |
905 | 905 | ||
906 | public bool CanDelinkObject(LLUUID userID, LLUUID objectID) | 906 | public bool CanDelinkObject(LLUUID userID, LLUUID objectID) |
907 | { | 907 | { |
908 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 908 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
909 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 909 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
910 | 910 | ||
911 | return true; | 911 | return true; |
912 | } | 912 | } |
913 | 913 | ||
914 | public bool CanBuyLand(LLUUID userID, ILandObject parcel, Scene scene) | 914 | public bool CanBuyLand(LLUUID userID, ILandObject parcel, Scene scene) |
915 | { | 915 | { |
916 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 916 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
917 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 917 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
918 | 918 | ||
919 | return true; | 919 | return true; |
920 | } | 920 | } |
921 | 921 | ||
922 | public bool CanCopyInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) | 922 | public bool CanCopyInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) |
923 | { | 923 | { |
924 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 924 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
925 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 925 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
926 | 926 | ||
927 | return true; | 927 | return true; |
928 | } | 928 | } |
929 | 929 | ||
930 | public bool CanDeleteInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) | 930 | public bool CanDeleteInventory(LLUUID itemID, LLUUID objectID, LLUUID userID) |
931 | { | 931 | { |
932 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 932 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
933 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 933 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
934 | 934 | ||
935 | return true; | 935 | return true; |
936 | } | 936 | } |
937 | 937 | ||
938 | public bool CanCreateInventory(uint invType, LLUUID objectID, LLUUID userID) | 938 | public bool CanCreateInventory(uint invType, LLUUID objectID, LLUUID userID) |
939 | { | 939 | { |
940 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 940 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
941 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 941 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
942 | 942 | ||
943 | return true; | 943 | return true; |
944 | } | 944 | } |
945 | 945 | ||
946 | public bool CanTeleport(LLUUID userID) | 946 | public bool CanTeleport(LLUUID userID) |
947 | { | 947 | { |
948 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 948 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
949 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 949 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
950 | 950 | ||
951 | return true; | 951 | return true; |
952 | } | 952 | } |
953 | 953 | ||
954 | 954 | ||
955 | } | 955 | } |
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs index beb74ce..1bdc702 100644 --- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs | |||
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules | |||
99 | // Current time in elpased seconds since Jan 1st 1970 | 99 | // Current time in elpased seconds since Jan 1st 1970 |
100 | private ulong CurrentTime | 100 | private ulong CurrentTime |
101 | { | 101 | { |
102 | get { | 102 | get { |
103 | return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset)/10000000); | 103 | return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset)/10000000); |
104 | } | 104 | } |
105 | } | 105 | } |
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment.Modules | |||
118 | 118 | ||
119 | TimeZone local = TimeZone.CurrentTimeZone; | 119 | TimeZone local = TimeZone.CurrentTimeZone; |
120 | TicksOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks; | 120 | TicksOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks; |
121 | 121 | ||
122 | m_log.Debug("[SUN] localtime offset is " + TicksOffset); | 122 | m_log.Debug("[SUN] localtime offset is " + TicksOffset); |
123 | 123 | ||
124 | // Align ticks with Second Life | 124 | // Align ticks with Second Life |
@@ -246,7 +246,7 @@ namespace OpenSim.Region.Environment.Modules | |||
246 | avatar.ControllingClient.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition); | 246 | avatar.ControllingClient.SendSunPos(Position, Velocity, CurrentTime, SecondsPerSunCycle, SecondsPerYear, OrbitalPosition); |
247 | } | 247 | } |
248 | 248 | ||
249 | // set estate settings for region access to sun position | 249 | // set estate settings for region access to sun position |
250 | m_scene.RegionInfo.EstateSettings.sunPosition = Position; | 250 | m_scene.RegionInfo.EstateSettings.sunPosition = Position; |
251 | } | 251 | } |
252 | 252 | ||
@@ -281,7 +281,7 @@ namespace OpenSim.Region.Environment.Modules | |||
281 | 281 | ||
282 | Position = LLVector3.Rot(Position,Tilt); | 282 | Position = LLVector3.Rot(Position,Tilt); |
283 | 283 | ||
284 | // Finally we shift the axis so that more of the | 284 | // Finally we shift the axis so that more of the |
285 | // circle is above the horizon than below. This | 285 | // circle is above the horizon than below. This |
286 | // makes the nights shorter than the days. | 286 | // makes the nights shorter than the days. |
287 | 287 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs index eb981d9..98d69a5 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/BMP.cs | |||
@@ -31,9 +31,9 @@ using OpenSim.Region.Environment.Interfaces; | |||
31 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 31 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// A generic windows bitmap loader. | 34 | /// A generic windows bitmap loader. |
35 | /// Should be capable of handling 24-bit RGB images. | 35 | /// Should be capable of handling 24-bit RGB images. |
36 | /// | 36 | /// |
37 | /// Uses the System.Drawing filesystem loader. | 37 | /// Uses the System.Drawing filesystem loader. |
38 | /// </summary> | 38 | /// </summary> |
39 | internal class BMP : GenericSystemDrawing | 39 | internal class BMP : GenericSystemDrawing |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs index 484bb89..bb819e1 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/GenericSystemDrawing.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Region.Environment.Interfaces; | |||
33 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | 33 | namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// A virtual class designed to have methods overloaded, | 36 | /// A virtual class designed to have methods overloaded, |
37 | /// this class provides an interface for a generic image | 37 | /// this class provides an interface for a generic image |
38 | /// saving and loading mechanism, but does not specify the | 38 | /// saving and loading mechanism, but does not specify the |
39 | /// format. It should not be insubstantiated directly. | 39 | /// format. It should not be insubstantiated directly. |
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | |||
99 | } | 99 | } |
100 | 100 | ||
101 | /// <summary> | 101 | /// <summary> |
102 | /// Protected method, generates a grayscale bitmap | 102 | /// Protected method, generates a grayscale bitmap |
103 | /// image from a specified terrain channel. | 103 | /// image from a specified terrain channel. |
104 | /// </summary> | 104 | /// </summary> |
105 | /// <param name="map">The terrain channel to export to bitmap</param> | 105 | /// <param name="map">The terrain channel to export to bitmap</param> |
@@ -134,7 +134,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | |||
134 | } | 134 | } |
135 | 135 | ||
136 | /// <summary> | 136 | /// <summary> |
137 | /// Protected method, generates a coloured bitmap | 137 | /// Protected method, generates a coloured bitmap |
138 | /// image from a specified terrain channel. | 138 | /// image from a specified terrain channel. |
139 | /// </summary> | 139 | /// </summary> |
140 | /// <param name="map">The terrain channel to export to bitmap</param> | 140 | /// <param name="map">The terrain channel to export to bitmap</param> |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs index 0c4e3de..7bf88f0 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs | |||
@@ -43,14 +43,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
43 | double sum = 0.0; | 43 | double sum = 0.0; |
44 | double step2 = 0.0; | 44 | double step2 = 0.0; |
45 | 45 | ||
46 | // compute delta map | 46 | // compute delta map |
47 | for (x = 0; x < map.Width; x++) | 47 | for (x = 0; x < map.Width; x++) |
48 | { | 48 | { |
49 | for (y = 0; y < map.Height; y++) | 49 | for (y = 0; y < map.Height; y++) |
50 | { | 50 | { |
51 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); | 51 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); |
52 | 52 | ||
53 | if (z > 0) // add in non-zero amount | 53 | if (z > 0) // add in non-zero amount |
54 | { | 54 | { |
55 | sum += map[x, y] * z; | 55 | sum += map[x, y] * z; |
56 | step2 += z; | 56 | step2 += z; |
@@ -60,14 +60,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
60 | 60 | ||
61 | double avg = sum / step2; | 61 | double avg = sum / step2; |
62 | 62 | ||
63 | // blend in map | 63 | // blend in map |
64 | for (x = 0; x < map.Width; x++) | 64 | for (x = 0; x < map.Width; x++) |
65 | { | 65 | { |
66 | for (y = 0; y < map.Height; y++) | 66 | for (y = 0; y < map.Height; y++) |
67 | { | 67 | { |
68 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * duration; | 68 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * duration; |
69 | 69 | ||
70 | if (z > 0) // add in non-zero amount | 70 | if (z > 0) // add in non-zero amount |
71 | { | 71 | { |
72 | if (z > 1.0) | 72 | if (z > 1.0) |
73 | z = 1.0; | 73 | z = 1.0; |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs index f2a1800..6df8408 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/OlsenSphere.cs | |||
@@ -32,8 +32,8 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Speed-Optimised Hybrid Erosion Brush | 34 | /// Speed-Optimised Hybrid Erosion Brush |
35 | /// | 35 | /// |
36 | /// As per Jacob Olsen's Paper | 36 | /// As per Jacob Olsen's Paper |
37 | /// http://www.oddlabs.com/download/terrain_generation.pdf | 37 | /// http://www.oddlabs.com/download/terrain_generation.pdf |
38 | /// </summary> | 38 | /// </summary> |
39 | public class OlsenSphere : ITerrainPaintableEffect | 39 | public class OlsenSphere : ITerrainPaintableEffect |
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
164 | { | 164 | { |
165 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); | 165 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); |
166 | 166 | ||
167 | if (z > 0) // add in non-zero amount | 167 | if (z > 0) // add in non-zero amount |
168 | { | 168 | { |
169 | const int NEIGHBOUR_ME = 4; | 169 | const int NEIGHBOUR_ME = 4; |
170 | const int NEIGHBOUR_MAX = 9; | 170 | const int NEIGHBOUR_MAX = 9; |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs index 49946fd..fc0a579 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs | |||
@@ -43,14 +43,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
43 | double area = strength; | 43 | double area = strength; |
44 | double step = strength / 4.0; | 44 | double step = strength / 4.0; |
45 | 45 | ||
46 | // compute delta map | 46 | // compute delta map |
47 | for (x = 0; x < map.Width; x++) | 47 | for (x = 0; x < map.Width; x++) |
48 | { | 48 | { |
49 | for (y = 0; y < map.Height; y++) | 49 | for (y = 0; y < map.Height; y++) |
50 | { | 50 | { |
51 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); | 51 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); |
52 | 52 | ||
53 | if (z > 0) // add in non-zero amount | 53 | if (z > 0) // add in non-zero amount |
54 | { | 54 | { |
55 | double average = 0.0; | 55 | double average = 0.0; |
56 | int avgsteps = 0; | 56 | int avgsteps = 0; |
@@ -69,14 +69,14 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
69 | } | 69 | } |
70 | } | 70 | } |
71 | } | 71 | } |
72 | // blend in map | 72 | // blend in map |
73 | for (x = 0; x < map.Width; x++) | 73 | for (x = 0; x < map.Width; x++) |
74 | { | 74 | { |
75 | for (y = 0; y < map.Height; y++) | 75 | for (y = 0; y < map.Height; y++) |
76 | { | 76 | { |
77 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); | 77 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); |
78 | 78 | ||
79 | if (z > 0) // add in non-zero amount | 79 | if (z > 0) // add in non-zero amount |
80 | { | 80 | { |
81 | double da = z; | 81 | double da = z; |
82 | double a = (map[x, y] - tweak[x, y]) * da; | 82 | double a = (map[x, y] - tweak[x, y]) * da; |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs index 753d171..b3aa732 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/WeatherSphere.cs | |||
@@ -160,7 +160,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
160 | { | 160 | { |
161 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); | 161 | double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength); |
162 | 162 | ||
163 | if (z > 0) // add in non-zero amount | 163 | if (z > 0) // add in non-zero amount |
164 | { | 164 | { |
165 | const int NEIGHBOUR_ME = 4; | 165 | const int NEIGHBOUR_ME = 4; |
166 | const int NEIGHBOUR_MAX = 9; | 166 | const int NEIGHBOUR_MAX = 9; |