lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,461 Commits 5 Branches 12,734 Tags
bb841ea9cefb937c548646d366f689ef3bb80c61
Commit Graph

275 Commits

Author SHA1 Message Date
Melanie
a8faed6f76 Implement llSetContentType using the new OpenID auth support for authentication 2013-05-05 22:01:07 +02:00
Melanie
d5d6a274a7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-29 23:28:47 +00:00
Kevin Cozens
cbc9ae898c Added missing functionality (mainly custom headers) to llHTTPRequest. 2013-03-29 23:32:11 +00:00
Melanie
710381e838 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
 2013-03-13 02:02:46 +00:00
Justin Clark-Casey (justincc)
b7216f4daf minor: save some commented out log lines which will be useful again in future debugging of VectorRenderModule 2013-03-13 00:46:17 +00:00
Melanie
339d8ef2a6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-06 00:15:54 +00:00
Melanie
1ef50fef44 Experimental - add void return support to modSendCommand 2013-03-03 20:30:59 +01:00
Melanie
f39e4abf0e Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
 2013-03-03 13:24:37 +00:00
Melanie
ba0819be9e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2013-02-27 20:40:48 +00:00
Justin Clark-Casey (justincc)
59bd099b03 Add regression test for llReleaseUrl() (and for llRequestUrl) 
Forgot to add file for llRequestUrl() test in commit b8a7c8b
 2013-02-27 20:12:58 +00:00
Melanie
578174d21c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
 2013-02-27 18:05:04 +00:00
Justin Clark-Casey (justincc)
80c19b7cac Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already. 2013-02-27 00:21:02 +00:00
Justin Clark-Casey (justincc)
b8a7c8b26f Add regression test for llRequestUrl() 2013-02-26 23:36:36 +00:00
Melanie
13fe3546c3 Correctly remove https:// URLs from the http server. 2013-02-17 17:43:32 +01:00
Melanie
ea8c5ba707 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-15 21:42:16 +00:00
teravus
71862f34b6 * Handle null check on configs in module startup so that the the code can be run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement... 2013-02-14 18:52:11 -05:00
Melanie
e28c042dce Merge branch 'master' into careminster 2013-01-26 01:56:23 +00:00
Justin Clark-Casey (justincc)
f557d7e828 Add basic JsonCreateStore() regression test 2013-01-25 01:48:31 +00:00
Melanie
0b8bf69470 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2013-01-25 00:10:32 +00:00
Talun
71f7bfc2ff Mantis 6508 llHTTPResponse body is incorrectly interpreted by IE 
This patch html escapes responses going to IE so that they cannot be
interpreted as HTML if the response type is "text/plain". This has no
effect if the reponse type has been set to "text/html" by
osSetContentType

Signed-off-by: nebadon <michael@osgrid.org>
 2013-01-24 14:48:20 -07:00
Melanie
9d2e832b85 Null check the response body to make sure we're not crashing the script engine 2013-01-24 18:23:10 +01:00
Melanie
b7b3063849 Implement HTTP Request froma thread pool to avoid packet congestion 2013-01-20 18:38:00 +01:00
Melanie
cf4bf7432a Revert "Refactor scripted http request to use async calls rather than hard threads" 
This reverts commit 461ecd7cf9.
 2013-01-20 15:58:20 +01:00
Melanie
461ecd7cf9 Refactor scripted http request to use async calls rather than hard threads 2013-01-20 02:08:38 +01:00
Melanie
556d70feef Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
 2012-11-13 17:37:39 +00:00
Diva Canto
608444c9f7 Another 21 modules' directives moved out of .addin.xml 2012-11-13 08:27:51 -08:00
Melanie
9a5679876e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
 2012-11-13 02:10:09 +00:00
Diva Canto
335ff4359c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-12 18:08:27 -08:00
Diva Canto
86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00
Melanie
3398999149 Merge branch 'master' into careminster 2012-11-13 01:57:11 +00:00
Melanie
40d5148bbc Update ScriptModuleComms name space to CoreModules 2012-11-13 01:56:32 +00:00
Melanie
d9b149b375 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
 2012-11-12 15:46:45 +00:00
Diva Canto
db418bff2b Fix issues with the DynamicTextureModule and corresponding unit tests. 2012-11-11 19:39:21 -08:00
Diva Canto
571f6a0300 One more module converted: XMLRPCModule. Removed it from the special loading at start. 2012-11-11 15:29:25 -08:00
Diva Canto
4de8915ddd One more module converted: VectorRenderModule. 2012-11-11 15:04:02 -08:00
Diva Canto
9f45198516 One more module: DynamicTextureModule. Removed it from the special load in the beginning. 2012-11-11 14:54:40 -08:00
Diva Canto
6759ed1013 One more module converted: LoadImageURLModule. Also removed it from its hard-coded instantiation (I think I understood what the problem was, and that I've done it right). 2012-11-11 14:46:22 -08:00
Diva Canto
963b1e861c One more module converted: ScriptsHttpRequests. 2012-11-11 14:22:06 -08:00
Diva Canto
84be90e5f8 One more module converted: EmailModule. 2012-11-11 14:00:58 -08:00
Melanie
389077345f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
 2012-11-11 16:31:01 +00:00
SignpostMarv
d5f9f5c9c3 document, 80-character width terminal formatting converting comments to documentation for IDE & doxygen goodness 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2012-11-10 17:09:47 -08:00
SignpostMarv
b3dddd7447 document & 80-character width terminal formatting 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2012-11-10 17:09:47 -08:00
SignpostMarv
a87c4c7d89 Converting WorldCommModule to INonSharedRegionModule 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2012-11-10 17:09:46 -08:00
Melanie
f391d028de Add a method to query all registered script constants to allow non-XEngine 
script engines to use them.
 2012-11-04 22:39:15 +00:00
Melanie
dd416298f1 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-11-04 22:37:28 +00:00
Melanie
26cc57b6ca Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
 2012-10-26 21:13:01 +01:00
SignpostMarv
80dcc13af2 refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field with a private setter 2012-10-26 02:08:00 +01:00
SignpostMarv
e977761071 adding ability for listeners to be filtered by regular expressions and a general-purpose function to see if a given string matches a given regex 2012-10-26 02:08:00 +01:00
SignpostMarv
18b1ee6f37 Formatting and casing correction in WorldCommModule, trailing new line in OSSL to get git diff to not complain 2012-10-26 02:08:00 +01:00
Melanie
6ad8d3c43f Merge branch 'master' into careminster 2012-10-20 02:33:24 +01:00