| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-03-13 | 1 | -0/+5 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs | ||||
| | * | minor: save some commented out log lines which will be useful again in ↵ | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -0/+5 |
| | | | | | | | | | future debugging of VectorRenderModule | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2013-03-06 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | ||||
| | * | | Experimental - add void return support to modSendCommand | Melanie | 2013-03-03 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-03-03 | 1 | -1/+7 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | ||||
| | * | | Correctly remove https:// URLs from the http server. | Melanie | 2013-02-17 | 1 | -1/+7 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 1 | -9/+17 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | ||||
| | * | | Add regression test for llReleaseUrl() (and for llRequestUrl) | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -9/+16 |
| | | | | | | | | | | | | | Forgot to add file for llRequestUrl() test in commit b8a7c8b | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 2 | -23/+31 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | | Make sure we dispose of WebResponse, StreamReader and Stream in various ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -6/+10 |
| | | | | | | | | | | | | | places where we were not already. | ||||
| | * | | Add regression test for llRequestUrl() | Justin Clark-Casey (justincc) | 2013-02-26 | 1 | -16/+21 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-15 | 1 | -6/+8 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | | * Handle null check on configs in module startup so that the the code can be ↵ | teravus | 2013-02-14 | 1 | -6/+8 |
| | | | | | | | | | | | | | 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... | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-26 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Add basic JsonCreateStore() regression test | Justin Clark-Casey (justincc) | 2013-01-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-01-25 | 1 | -0/+15 |
| |\ \ \ | |/ / | | / | |/ |/| | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | ||||
| | * | Mantis 6508 llHTTPResponse body is incorrectly interpreted by IE | Talun | 2013-01-24 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | Null check the response body to make sure we're not crashing the script engine | Melanie | 2013-01-24 | 1 | -0/+6 |
| | | | |||||
| * | | Implement HTTP Request froma thread pool to avoid packet congestion | Melanie | 2013-01-20 | 1 | -14/+45 |
| | | | |||||
| * | | Revert "Refactor scripted http request to use async calls rather than hard ↵ | Melanie | 2013-01-20 | 1 | -87/+53 |
| | | | | | | | | | | | | | threads" This reverts commit 461ecd7cf9edebce45ab715901a7f3b02c216e7b. | ||||
| * | | Refactor scripted http request to use async calls rather than hard threads | Melanie | 2013-01-20 | 1 | -53/+87 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -0/+5 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | ||||
| | * | Another 21 modules' directives moved out of .addin.xml | Diva Canto | 2012-11-13 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-11-12 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -1/+1 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Update ScriptModuleComms name space to CoreModules | Melanie | 2012-11-13 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 6 | -134/+244 |
| |\ \ | |/ | | | | | | | | | | | | | 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 | ||||
| | * | Fix issues with the DynamicTextureModule and corresponding unit tests. | Diva Canto | 2012-11-11 | 3 | -32/+39 |
| | | | |||||
| | * | One more module converted: XMLRPCModule. Removed it from the special loading ↵ | Diva Canto | 2012-11-11 | 1 | -31/+51 |
| | | | | | | | | | at start. | ||||
| | * | One more module converted: VectorRenderModule. | Diva Canto | 2012-11-11 | 1 | -27/+41 |
| | | | |||||
| | * | One more module: DynamicTextureModule. Removed it from the special load in ↵ | Diva Canto | 2012-11-11 | 1 | -11/+27 |
| | | | | | | | | | the beginning. | ||||
| | * | One more module converted: LoadImageURLModule. Also removed it from its ↵ | Diva Canto | 2012-11-11 | 1 | -19/+38 |
| | | | | | | | | | hard-coded instantiation (I think I understood what the problem was, and that I've done it right). | ||||
| | * | One more module converted: ScriptsHttpRequests. | Diva Canto | 2012-11-11 | 1 | -9/+25 |
| | | | |||||
| | * | One more module converted: EmailModule. | Diva Canto | 2012-11-11 | 1 | -46/+64 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 1 | -75/+187 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | ||||
| | * | document, 80-character width terminal formatting converting comments to ↵ | SignpostMarv | 2012-11-10 | 1 | -15/+65 |
| | | | | | | | | | | | | | documentation for IDE & doxygen goodness Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
| | * | document & 80-character width terminal formatting | SignpostMarv | 2012-11-10 | 1 | -56/+114 |
| | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
| | * | Converting WorldCommModule to INonSharedRegionModule | SignpostMarv | 2012-11-10 | 1 | -11/+25 |
| | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
| | * | Add a method to query all registered script constants to allow non-XEngine | Melanie | 2012-11-04 | 1 | -0/+16 |
| | | | | | | | | | script engines to use them. | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-11-04 | 1 | -0/+16 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -23/+110 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field ↵ | SignpostMarv | 2012-10-26 | 1 | -12/+8 |
| | | | | | | | | | | | | | with a private setter | ||||
| | * | | adding ability for listeners to be filtered by regular expressions and a ↵ | SignpostMarv | 2012-10-26 | 1 | -19/+110 |
| | | | | | | | | | | | | | general-purpose function to see if a given string matches a given regex | ||||
| | * | | Formatting and casing correction in WorldCommModule, trailing new line in ↵ | SignpostMarv | 2012-10-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | OSSL to get git diff to not complain | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | minor: comment out currently unused logger in DynamicTextureModule | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Revert "Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 3 | -9/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef. | ||||
| | * | | Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 3 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |