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/Scripting | |
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 '')
4 files changed, 42 insertions, 42 deletions
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) |