aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-2913-124/+132
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Move update of the final optional ODE total frame stat inside the OdeLock ↵Justin Clark-Casey (justincc)2012-06-291-3/+3
| | | | | | | | rather than outside to avoid a very occasional race condition with the stat collection thread
| * refactor: rename _collisionEventPrim to m_collisionEventActors and ↵Justin Clark-Casey (justincc)2012-06-291-12/+12
| | | | | | | | | | | | _collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents. These dictionaries handle all actor types, not just physical prims.
| * Fix a regression where we stopped removing avatars from collision event ↵Justin Clark-Casey (justincc)2012-06-291-1/+1
| | | | | | | | | | | | | | reporting on logout, rather than stopping clearing their collision events. This occurred in b18c8c8 (Thu May 17 2012). This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region.
| * If a link points to a non-existing item in FetchInventory caps, then don't ↵Justin Clark-Casey (justincc)2012-06-291-1/+2
| | | | | | | | try to add it to the return data rather than suffering an exception later on
| * Add IScene.Name for code clarity to replace the RegionInfo.RegionName used ↵Justin Clark-Casey (justincc)2012-06-294-32/+38
| | | | | | | | in many, many log messages.
| * Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG ↵Justin Clark-Casey (justincc)2012-06-285-52/+58
| | | | | | | | | | | | | | directly instead of an item ID to then shuffle through attachments, saving CPU busywork. Almost all callers already had the sog to hand. Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
| * Rather than iterating through all SOGs in the scene looking for the one that ↵Justin Clark-Casey (justincc)2012-06-281-24/+17
| | | | | | | | matches out fromItemID on detach, go through the agent's attachment sog list instead.
| * Remove code that tried to delete an attachment back to inventory if ↵Justin Clark-Casey (justincc)2012-06-281-6/+1
| | | | | | | | | | | | | | RezSingleAttachmentFromInventoryInternal() returned null. null would only ever be returned if the item couldn't be located within inventory and this would happen immediately. In this case, derezzing wouldn't work anyway since there is no item to derez.
| * If rest of first line after colon is blank then still warn about running in ↵Justin Clark-Casey (justincc)2012-06-281-11/+18
| | | | | | | | | | | | | | XEngine if engine specified does not exist. This is to take account of situations where the user was intending to specify a script engine using colon using its default language. This probably generates few false positive as scripts are less likely to end a first line colon with a comment for other purposes.
* | Merge branch 'avination' into careminsterMelanie2012-06-2911-46/+94
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| * | Fix llRegionSayTo the right wayMelanie2012-06-284-11/+37
| | |
| * | Return NPC instead of AGENT in the detect parameters for touch, collision andMelanie2012-06-281-0/+2
| | | | | | | | | | | | sensor.
| * | Comment out a spammy message that will spew 4 lines for each request to aMelanie2012-06-271-1/+2
| | | | | | | | | | | | nonexistent URL for http-in
| * | Add an event to the poll service manager thread to allow starting itMelanie2012-06-262-4/+14
| | | | | | | | | | | | when needed rather than once per second. That is just too slow!
| * | Disable physics raycast until it can be seen to. Fix distance calculationMelanie2012-06-261-2/+3
| | | | | | | | | | | | for some results.
| * | Correct a wrong error constantMelanie2012-06-261-1/+1
| | |
| * | Prevent bad prim in the database from crashing the sim, list affectedMelanie2012-06-261-26/+34
| | | | | | | | | | | | ids and skip them.
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-286-119/+59
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 679da63da617d031e5e7ae3f2d2a29db1a23ace3. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
* | | Merge branch 'master' into careminsterMelanie2012-06-2817-240/+507
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Avoid reporting false positives when a colon is in a comment in the first ↵Justin Clark-Casey (justincc)2012-06-281-17/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | line of a script where the user was not trying to select a different script engine. This works by only posting the "Selected engine unavailable" message if we're falling back on XEngine and the language is one handled by XEngine. In cases where the language is not handled or not allowed, the user will still be notified by the later compiler error. This avoids the overwhelming majority of false positives where the first line contains a : for other reasons (e.g. source control systems, vim settings, etc.) Ultimately, I think it would be better to detect script language/engine with a mechanism that didn't just rely on : detection (e.g like #! in unix scripts).
| * | minor: reuse colon index calculation in XEngine.OnRezScript. The index if a ↵Justin Clark-Casey (justincc)2012-06-281-2/+2
| | | | | | | | | | | | colon is found on the first line will always be the same as for the whole script.
| * | Fix issue in InventoryArchiveTestCase where it didn't call down to ↵Justin Clark-Casey (justincc)2012-06-271-1/+2
| | | | | | | | | | | | OpenSimTestCase.SetUp()
| * | refactor: Move ScenePresence <-> AgentData attachments copying code into ↵Justin Clark-Casey (justincc)2012-06-274-37/+74
| | | | | | | | | | | | AttachmentsModule.
| * | Automatically disable log4net before each regression test so that logging is ↵Justin Clark-Casey (justincc)2012-06-274-5/+50
| | | | | | | | | | | | | | | | | | | | | confined to a single test if it's turned on. This involves making test classes inherit from a common OpenSimTestCase. This will be applied to more classes as required.
| * | Replace "kill uuid" console command with the more consistent "delete object ↵Justin Clark-Casey (justincc)2012-06-261-56/+0
| | | | | | | | | | | | uuid", which was present in the last opensim release.
| * | Fix output for help on some object region console commandsJustin Clark-Casey (justincc)2012-06-261-3/+6
| | |
| * | Show region positions in "show regions" robust console commandJustin Clark-Casey (justincc)2012-06-261-1/+7
| | |
| * | minor: correct GridService "show regions" cibsike cinnabd usage statementJustin Clark-Casey (justincc)2012-06-261-1/+1
| | |
| * | refactor: Remove unnecessary AttachmentModuleTests.m_userId in favour of ↵Justin Clark-Casey (justincc)2012-06-262-40/+31
| | | | | | | | | | | | local variables
| * | refactor: Use local attachment module variables instead of global m_attMod.Justin Clark-Casey (justincc)2012-06-261-11/+10
| | | | | | | | | | | | This also avoids confusion between tests where one sets up m_attMod and another accidentally uses it after failing to set one up itself.
| * | refactor: make m_presence a local variable in all AttachmentsModuleTests ↵Justin Clark-Casey (justincc)2012-06-261-26/+25
| | | | | | | | | | | | since it doesn't need to be global and some tests set up more than one sp
| * | Add regression test to check that attachments in source region are deleting ↵Justin Clark-Casey (justincc)2012-06-262-18/+120
| | | | | | | | | | | | when an agent teleports to a neighbouring region
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-261-0/+5
| |\ \
| | * | Add stub for llCastRayBlueWall2012-06-261-0/+5
| | | |
| * | | If crossing attachments into another region pre-fatpack, clone objects ↵Justin Clark-Casey (justincc)2012-06-261-17/+26
| |/ / | | | | | | | | | | | | | | | | | | before changing properties to avoid hud display race condition with update threads. This matches behaviour in fatpack crossing, where attachments are cloned before their properties are changed. This only applies to crossings to simulators running code released before April 2011.
| * | Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.Justin Clark-Casey (justincc)2012-06-262-6/+20
| | | | | | | | | | | | Use these for new "show regions" command rather than old cumbersome stuff.
| * | Add "show regions" console command to ROBUST to show all regions currently ↵Justin Clark-Casey (justincc)2012-06-261-0/+44
| | | | | | | | | | | | | | | | | | registered. Command is not added in standalone, which has its own version of "show regions" that can also show estate name
| * | Add "show region at" command to grid service to get the details of a region ↵Justin Clark-Casey (justincc)2012-06-251-22/+69
| | | | | | | | | | | | | | | | | | | | | at a specific location. "show region" command becomes "show region name" to disambiguate This is the same format as used by "show object name", etc. "deregister region" also becomes "deregister region id"
| * | minor: update currently commented out log message at top of ↵Justin Clark-Casey (justincc)2012-06-251-1/+3
| | | | | | | | | | | | AvatarFactoryModule.SetAppearance() for future use
* | | 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.
generated by cgit v1.1 at 2024-11-18 21:55:20 +0000