aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-312-44/+80
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Make ReuseDynamicTextures an experimental config setting in [Textures]. ↵Justin Clark-Casey (justincc)2012-08-301-1/+4
| | | | | | | | | | | | | | | | | | | | Default is false, as before. If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them. This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable). Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry). If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated. CUrrently experimental. Default is false, as before.
| * If the compile-time DynamicTextureModule.ReuseTextures flag is set, check ↵Justin Clark-Casey (justincc)2012-08-301-43/+59
| | | | | | | | metadata still exists for any reused asset in case some other process has removed it from the cache.
| * This partially implements the LSL function to set the responseMic Bowman2012-08-291-1/+19
| | | | | | | | | | | | | | | | type for an HTTP request. Since the "official" LSL function limits the use of the response type, it is implemented as osSetContentType with a string for the content mime type and a threat level of high. With this function you should be able to implement rather functional media-on-a-prim application with much less difficulty.
* | Merge branch 'master' into careminsterMelanie2012-08-294-70/+410
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * Add experimental DynamicTextureModule.ReuseTextures flag, currently only ↵Justin Clark-Casey (justincc)2012-08-284-55/+297
| | | | | | | | | | | | | | | | | | | | | | configurable on compile. Disabled (status quo) by default. This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours. This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web). This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures. A downside is that this stops expiry of old temporary dynamic textures from the cache, Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours.
| * Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). ↵Justin Clark-Casey (justincc)2012-08-282-6/+7
| | | | | | | | Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.
| * minor: Simplify return of vector render module name and some very minor ↵Justin Clark-Casey (justincc)2012-08-271-4/+3
| | | | | | | | removal of unncessary syntax clutter
| * Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams()Justin Clark-Casey (justincc)2012-08-271-2/+32
| |
| * Add VectorRenderModuleTests.TestRepeatDrawContainingImage()Justin Clark-Casey (justincc)2012-08-271-0/+31
| |
| * Add VectorRenderModuleTests.TestRepeatDraw()Justin Clark-Casey (justincc)2012-08-271-11/+48
| |
* | Merge branch 'master' into careminsterMelanie2012-08-231-26/+42
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Lock disposal of separate gdi+ objects under different threads since this ↵Justin Clark-Casey (justincc)2012-08-221-26/+42
| | | | | | | | | | | | | | | | | | | | prevents malloc heap corruption seen under Ubuntu 10.04.1 and 11.04 - probably a libcairo issue In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously, the native malloc heap can become corrupted, possibly due to a double free(). This may be due to bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX. These problems were seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1. They go away if disposal is perfomed under lock.
* | Merge branch 'careminster' into avinationMelanie2012-08-141-4/+9
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * \ Merge branch 'master' into careminsterMelanie2012-08-041-3/+8
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * Fix the recent windows compile error by putting newFont for case "R" in ↵Justin Clark-Casey (justincc)2012-08-031-3/+8
| | | | | | | | | | | | VectorRenderModule inside its own context, rather than disposing of the old font before using it as a prototype for the new.
| | * attempting to fix a build issueSignpostMarv2012-08-031-2/+2
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | fix build on winUbitUmarov2012-08-041-2/+2
|/ /
* | Merge branch 'master' into careminsterMelanie2012-08-032-253/+391
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic ↵Justin Clark-Casey (justincc)2012-08-031-253/+316
| | | | | | | | | | | | | | textures. The convention is that if an object implements IDiposable() the code must explicitly call Dispose() or call it via the using statement. This may be particularly important for GDI+ objects since they encapsulate native code entities.
| * Add simple draw test for the VectorRenderModuleJustin Clark-Casey (justincc)2012-08-021-0/+75
| |
| * Resolve various race conditions between accessing and removing external ↵Justin Clark-Casey (justincc)2012-06-221-132/+148
| | | | | | | | script URLs by more consistently locking on m_UrlMap
| * Avoid a race condition where an incoming request to a script external URL ↵Justin Clark-Casey (justincc)2012-06-221-35/+73
| | | | | | | | | | | | | | | | | | | | | | can trigger an exception is the URL was being removed at the same time. This involves three steps 1) Return gracefully in UrlModule.HttpRequestHandler() instead of throwing an exception when the url cannot be found in its index 2) Return true instead of false in HasEvents() if no matching request is found in the map. This call will only happen in the first place for raced requests. 3) Return a 404 in GetEvents() if the request is not in the index, rather than a blank 200 OK. Many thanks to Tom Haines in http://opensimulator.org/mantis/view.php?id=6051 for doing some of the work on this.
* | Bump number of URLs to 15000 per regionMelanie2012-07-291-1/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-07-161-5/+5
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Make https work in the poll service managerMelanie2012-07-151-2/+2
| | |
| * | Fix a double parenthesis typoMelanie2012-07-151-1/+1
| | |
| * | Set up https to work like http does in the poll handlerMelanie2012-07-151-3/+3
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-07-061-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-051-4/+4
| | | | | | | | | | | | | | | the manager to tell what type of event it is. All events except for lsl http in go to the "slow queue" which is run once per second as before.
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-041-2/+2
| | | | | | | | | | | | it's timeout
* | | Merge branch 'avination' into careminsterMelanie2012-06-292-8/+14
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| * | Fix llRegionSayTo the right wayMelanie2012-06-281-7/+12
| | |
| * | Comment out a spammy message that will spew 4 lines for each request to aMelanie2012-06-271-1/+2
| | | | | | | | | | | | nonexistent URL for http-in
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-281-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 679da63da617d031e5e7ae3f2d2a29db1a23ace3. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
* | | Merge branch 'master' into careminsterMelanie2012-06-211-1/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Change read config paramter from max_urls_per_simulator to ↵Justin Clark-Casey (justincc)2012-06-161-1/+1
| | | | | | | | | | | | max_external_urls_per_simulator, which is what it was meant to be
| * | Implement max_external_urls_per_simulator setting in [LL-Functions] to allow ↵Justin Clark-Casey (justincc)2012-06-161-1/+8
| | | | | | | | | | | | | | | | | | | | | configuration of how many urls can be set up by llRequestURL() Defaults remains as 100. This setting is per simulator instead of per region due to how the url script module is structured.
* | | Merge branch 'master' into careminsterMelanie2012-06-151-4/+5
|\ \ \ | |/ /
| * | Make XMLRPCModule use an existing HTTP server if one already exists on the ↵Justin Clark-Casey (justincc)2012-06-151-4/+5
| | | | | | | | | | | | desired port.
* | | Merge branch 'master' into careminsterMelanie2012-05-271-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Fix llGetSimulatorHostname to return configured hostnameBlueWall2012-05-231-0/+4
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-141-19/+5
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out ↵Chris Koeritz2012-05-131-19/+5
| | | | | | | | | | | | | | | | | | of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'master' into careminsterMelanie2012-05-051-0/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Temporarily add debug log lines to lsl url request and releaseJustin Clark-Casey (justincc)2012-05-041-0/+13
| | | | | | | | | | | | To help with http://opensimulator.org/mantis/view.php?id=5993
* | | Merge branch 'master' into careminsterMelanie2012-04-231-35/+35
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Mantis 5977 Corrections to llRegionSayToTalun2012-04-231-35/+35
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-03-311-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per ↵Justin Clark-Casey (justincc)2012-03-311-1/+1
| | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlRegionSayTo Addresses http://opensimulator.org/mantis/view.php?id=5950
generated by cgit v1.1 at 2024-12-21 07:49:34 +0000