aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-2617-143/+245
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * When attachments are being saved and deleted for a closing root agent, ↵Justin Clark-Casey (justincc)2012-06-254-29/+42
| | | | | | | | | | | | delete first to avoid a hud race condition with update threads. If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
| * In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove ↵Justin Clark-Casey (justincc)2012-06-253-2/+42
| | | | | | | | | | | | | | | | | | attachment before changing properties for correct inventory serialization. Serialization of attachments requires IsAttachment = false so that correct positions are serialized instead of avatar position. However, doing this when a hud is still attached allows race conditions with update threads, resulting in hud artifacts on other viewers. This change sets SOG.IsDeleted before serialization changes take place (IsDeleted itself is not a serialized property). LLClientView then screens out any deleted SOGs before sending updates to viewers.
| * Fix script "Running" behaviorBlueWall2012-06-236-0/+53
| | | | | | | | Unchecking "Running" box in script editor now persists. This fixes http://opensimulator.org/mantis/view.php?id=6057
| * 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-223-40/+84
| | | | | | | | | | | | | | | | | | | | | | 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.
| * Avoid race condition between m_PrimObjects iteration in ↵Justin Clark-Casey (justincc)2012-06-221-14/+14
| | | | | | | | XEngine.PostObjectEvent and places where the list is modified by extending the m_PrimObjects lock.
| * If starting scripts on initial sim start, provide INFO level log feedback ↵Justin Clark-Casey (justincc)2012-06-223-8/+12
| | | | | | | | | | | | | | each time 50 scripts have been started. This is to provide an indication of what's happening now that the default isn't to report every single script start. Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
| * Eliminate unnecessary extra call to TriggerEmptyScriptCompileQueue in ↵Justin Clark-Casey (justincc)2012-06-221-9/+2
| | | | | | | | | | | | XEngine.DoOnRezScriptQueue() The later invocation of this function will happen on an empty compile queue.
| * Stop flicking IsAttachment false and then true in ↵Justin Clark-Casey (justincc)2012-06-221-10/+0
| | | | | | | | | | | | | | | | AttachmentsModule.UpdateAttachmentPosition() in order to avoid a hud update race condition. Previously, setting IsAttachment to false then true was necessary to serialize the updated attachment object information. However, UpdateAttachmentPosition no longer does this update. Whilst IsAttachment is set to false there is a race condition where the update thread can wrongly send hud object updates to clients that do not own the hud, resulting in screen artifacts.
| * Fix bug where attachments would not retain position if just rotated and not ↵Justin Clark-Casey (justincc)2012-06-221-0/+5
| | | | | | | | | | | | moved. This was because we were not setting AttachedPos in SOG.UpdateGroupPositionPR, unlike UpdateGroupPosition
| * refactor AttachmentsModule tests to use a common method for standard ↵Justin Clark-Casey (justincc)2012-06-221-70/+69
| | | | | | | | attachment item setup
| * Add regression test for updating attachment positionJustin Clark-Casey (justincc)2012-06-221-0/+30
| |
| * Add item id, name, prim name and id to log message when state exists but ↵Justin Clark-Casey (justincc)2012-06-211-5/+5
| | | | | | | | | | | | loading fails. Drop logging about memory limit exceeded to warn from error
| * Retrigger build - last jenkins run was glitchedJustin Clark-Casey (justincc)2012-06-211-1/+2
| |
| * Add state file location to errors logged when there's some issue with ↵Justin Clark-Casey (justincc)2012-06-211-4/+4
| | | | | | | | retrieving state (e.g. exceeds memory limit)
* | Merge branch 'master' into careminsterMelanie2012-06-2122-138/+266
|\ \ | |/ | | | | | | | | | | | | 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
| * Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() ↵Justin Clark-Casey (justincc)2012-06-201-2/+3
| | | | | | | | instead of magic numbers
| * refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() ↵Justin Clark-Casey (justincc)2012-06-201-2/+3
| | | | | | | | instead of attachmentpoint magic numbers.
| * As with LLSDInventoryItem from commit 01a2b0b, send type values in ↵Justin Clark-Casey (justincc)2012-06-202-8/+4
| | | | | | | | | | | | LLSDInventoryFolder for inventory CAPs as integers rather than strings. Should also resolve some issues with exceptions being thrown in some inventory fetches.
| * Lower warn logging on not having friends/group module on permissions to debug.Justin Clark-Casey (justincc)2012-06-201-2/+2
| | | | | | | | It's a valid configuration not to have these modules, but I think it's still worth logging the fact that certain permissions won't work (always return true)
| * minor: Lower flotsam asset cache warning about not having a FlotsamCache.ini ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | | | | | to debug It's perfectly okay not to have this section.
| * Change default logging level for XEngine to WARN instead of DEBUG.Justin Clark-Casey (justincc)2012-06-201-0/+5
| | | | | | | | | | | | | | This is to reduce log spam from script loading, which is especially spammy for avatar movements with scripted attachments. All important messages are at warn or above. If you still want/need to see these messages, set <level value="DEBUG"/> in the <logger name="OpenSim.Region.ScriptEngine.XEngine"> section of OpenSim.exe.config. This affects no other package logs, which still output at the root configured level (currently DEBUG by default).
| * Remove STARTUP COMPLETE message from the startuplogo.txt file and into main ↵Justin Clark-Casey (justincc)2012-06-202-2/+3
| | | | | | | | logging
| * Comment out the neighbour and land in connectors from info logging that they ↵Justin Clark-Casey (justincc)2012-06-203-3/+3
| | | | | | | | are starting up
| * Comment out recently added log message detailing number of scripts started ↵Justin Clark-Casey (justincc)2012-06-201-2/+2
| | | | | | | | when compile queue empties for now
| * Raise some IO associated Exception logging in XEngine to error level, in ↵Justin Clark-Casey (justincc)2012-06-201-7/+5
| | | | | | | | | | | | line with other similar cases. Remove more unnecessary Close() calls - these are being triggered by the Dispose() called when exiting the using statement for these sdk io objects.
| * Log how many scripts are candidates for starting and how many are actually ↵Justin Clark-Casey (justincc)2012-06-205-66/+166
| | | | | | | | | | | | started. Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
| * If RegionReady is active, don't falsely say that logins are enabled in the ↵Justin Clark-Casey (justincc)2012-06-201-2/+2
| | | | | | | | | | | | main scene loop before RegionReady is signalled when initial script compilation finishes. Also raises this logging level to Info from Debug since this information is of high importance. This matches the behaviour of the RegionReady module
| * minor: If logging because mesh/sculpt data isn't present for an object, log ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | object UUID rather than local id, since UUID doesn't potentially vary between simulator starts.
| * Like the assembly and text files, only write the c#-lsl linemap in ↵Justin Clark-Casey (justincc)2012-06-191-27/+27
| | | | | | | | | | | | XEngine.SetXMLState() if the trust binaries flag is set. This doesn't affect other locations where the map is written, such as on script compilation.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-192-6/+17
| |\
| | * Oops! putting back the entry for map urlsBlueWall2012-06-161-0/+3
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-06-163-5/+12
| | |\
| | * | Adjust Robust*.ini.examples V3 webprofile entriesBlueWall2012-06-162-8/+16
| | | |
| * | | minor: Add a little more detail to IOException logging in XEngine.SetXMLState()Justin Clark-Casey (justincc)2012-06-191-11/+14
| | |/ | |/| | | | | | | | | | Also removes superflous Close() commands for statements taking place within using() constructs Also adds some comment out debug log messages for future use.
| * | 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
| * | Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses ↵Justin Clark-Casey (justincc)2012-06-161-3/+1
| | | | | | | | | | | | would always return OK even if some other status code had been set
| * | Implement max_external_urls_per_simulator setting in [LL-Functions] to allow ↵Justin Clark-Casey (justincc)2012-06-162-2/+11
| |/ | | | | | | | | | | | | 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-155-10/+10
|\ \ | |/
| * Add region name to UseCircuitCode log messagesJustin Clark-Casey (justincc)2012-06-151-4/+4
| |
| * Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-154-6/+6
| | | | | | | | scattering them over other categories
* | Merge branch 'avination' into careminsterMelanie2012-06-153-94/+588
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Reapply the one change that was in the revert that was actually function, notMelanie2012-06-151-1/+1
| | | | | | | | | | | | form
| * | Revert changes...UbitUmarov2012-06-152-76/+37
| | | | | | | | | | | | This reverts commit c8227e1bb70817351de283fb647ec39f090fc9f1.
| * | SL doesn't let scripts rotate root part of physical linksets also fix ↵UbitUmarov2012-06-151-16/+27
| | | | | | | | | | | | sitting avatars rotations broken in previus commit, forcing send of updates.
| * | Add sop IsPhysical and IsPhantom to be used gradually in core in place of ↵UbitUmarov2012-06-151-3/+21
| | | | | | | | | | | | asking physics engines all the time. Some engines delays may make them give wrong answers.
| * | only rotation of root part change parts positions, so only call ↵UbitUmarov2012-06-151-21/+31
| | | | | | | | | | | | ResetChildPrimPhysicsPositions() if root part. Plus 'cosmetics'
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-06-131-3/+11
| |\ \
| | * | Add detecting non-physical phantoms back into raycastMelanie2012-06-131-3/+11
| | | |
generated by cgit v1.1 at 2024-10-18 01:21:18 +0000