aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-071-0/+20
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)2012-03-061-0/+20
| | | | | | | | | | | | status" command. This is for diagnostic purposes.
* | Merge branch 'master' into careminsterMelanie2012-01-141-0/+8
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Allow SmtpClients and other SSL users to work with our cert handler installedMelanie2012-01-141-9/+25
| |
| * Register the UrlModule for script engine events OnScriptRemoved and ↵Justin Clark-Casey (justincc)2012-01-141-1/+8
| | | | | | | | | | | | | | | | | | OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. Doing this in every script is unnecessary since the event trigger is parameterized by the item id. All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException. Registration moved to UrlModule so that the handler is registered for all script engine implementations. This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
* | Allow SmtpClients and other SSL users to work with our cert handler installedMelanie2012-01-141-9/+25
| |
* | Merge branch 'master' into careminsterMelanie2012-01-021-3/+15
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * Fix for failed http request statusBlueWall2012-01-011-14/+17
| | | | | | | | Thanks "sendapatch" for fixes to llHTTPRequest status reporting.
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-11/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-071-11/+6
| | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
| * Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-2/+2
| |
* | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-2/+2
| |
* | Strip CR from http responses and limit them to 2048 charsMelanie2011-12-051-1/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-041-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Change default say distance to 20m from 30m, the same as on the big grid. ↵Justin Clark-Casey (justincc)2011-11-021-1/+1
| | | | | | | | | | | | This is to improve the migration of scripts that expect a 20m say distance. If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
* | Merge branch 'master' into bigmergeMelanie2011-11-032-5/+8
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Get some hopefully more useful exception information when ↵Justin Clark-Casey (justincc)2011-11-022-5/+8
| | | | | | | | OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules
* | Merge branch 'master' into bigmergeMelanie2011-10-261-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-251-0/+1
| | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
* | Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmergeMelanie2011-10-121-0/+1
|\ \ | |/
| * meaningless change to goose pandaJustin Clark-Casey (justincc)2011-10-111-0/+1
| |
* | Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmergeMelanie2011-10-121-6/+4
|\ \ | |/
| * remove unused LastAssetID from DynamicTextureUpdaerJustin Clark-Casey (justincc)2011-10-101-6/+4
| |
* | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmergeMelanie2011-10-111-3/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
| * Added a setting to [Startup] section of config that will allow the simulator ↵Kevin Houlihan & Michelle Argus2011-09-241-3/+6
| | | | | | | | | | | | to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
* | Bring us up to date.Tom2011-09-141-1/+2
|\ \ | |/
| * Try disabling the inconsistent attachment state check to see if this ↵Justin Clark-Casey (justincc)2011-09-051-1/+2
| | | | | | | | | | | | | | | | actually has an impact. The code in question is over three years old and just be catching an inconsistency rather than being wholly necessary. This commit still carries out the check and prints all the previous log warnings but a 'failure' no longer prevents avatar region crossing or teleport, and it doesn't give the client the error message. This will have some kind of impact on http://opensimulator.org/mantis/view.php?id=5672
* | Resolve merge commits, stage 1Tom2011-09-041-0/+87
|\ \ | |/
| * In WorldCommModule, replace the useless Attachments == null check with ↵Justin Clark-Casey (justincc)2011-08-311-2/+1
| | | | | | | | Attachments.Count == 0 instead
| * minor: seal up another instance of using the appearance list without lockingJustin Clark-Casey (justincc)2011-08-311-1/+1
| |
| * Make SP.Attachments available as sp.GetAttachments() instead.Justin Clark-Casey (justincc)2011-08-311-4/+8
| | | | | | | | | | | | | | The approach here, as in other parts of OpenSim, is to return a copy of the list rather than the attachments list itself This prevents callers from forgetting to lock the list when they read it, as was happening in various parts of the codebase. It also improves liveness. This might improve attachment anomolies when performing region crossings.
| * Add avatar and attachments to llRegionSayBlueWall2011-08-201-4/+67
| | | | | | | | | | | | | | | | | | | | | | | | llRegionSay will now message avatars on chan 0 and will message attachments on the avatar that listen on channels other than 0. This behavior is consistant with the LL implementation as tested on regions in Agni with one exception: this implementation does not include issue: https://jira.secondlife.com/browse/SCR-66?
| * Add llRegionSayToBlueWall2011-08-191-0/+21
| | | | | | | | | | | | | | llRegionSayTo(key target, integer channel, string messasge) Allows messages to be sent region-wide to a particular prim.
| * Fix the cert validation handler so that it will not block other parts ofMelanie2011-05-131-2/+10
| | | | | | | | the server doing ssl successfully.
* | Some additional protection, it seems that responsedata needs to be locked, ↵Tom2011-05-261-2/+13
| | | | | | | | but I can't immediately see where it's being accessed from another thread. For now, this will protect the server
* | Also fix the locking of url.requests and tidy the locks in generalTom2011-05-171-23/+31
| |
* | Lock m_requestMap properly to prevent some nasty access errors and the ↵Tom2011-05-171-30/+51
| | | | | | | | resulting downward spiral
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-081-5/+56
|\ \ | |/
| * Add support for llRequestSecureURL() if ssl is enabledBlueWall2011-05-051-5/+56
| |
* | Fix the cert validation handler so that it will not block other parts ofMelanie2011-04-171-2/+10
| | | | | | | | the server doing ssl successfully.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-121-7/+35
|\ \ | |/
| * minor: remove now inaccurate commentJustin Clark-Casey (justincc)2011-04-111-1/+1
| |
| * minor: adjust some spacing and indentationJustin Clark-Casey (justincc)2011-04-111-10/+10
| |
| * Implimented HTTP_VERIFY_CERT for llHttpRequestE. Allen Soard2011-04-111-3/+31
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-031-2/+0
|\ \ | |/
| * Comment out some startup logging lines to make up for the one I added ↵Justin Clark-Casey (justincc)2011-04-021-2/+0
| | | | | | | | | | | | earlier on. Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy)
* | Since we've plugged the leak, now increase URLs to 5000 since the limit is ↵Tom2011-03-211-1/+1
| | | | | | | | being hit in several sims
* | Repair x-query-stringTom2011-02-031-1/+1
| |
* | Fix cm/15627 : Don't block the entire URL on duplicate requests, just that ↵Tom2011-01-311-3/+3
| | | | | | | | particular request!
* | If llHTTPRequest results in an error, still attempt to get the response ↵Tom2011-01-291-1/+11
| | | | | | | | text. If we can't (which implies the server is unreachable), return the StatusDescription as before.
generated by cgit v1.1 at 2024-12-18 22:19:42 +0000