aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-2913-124/+132
|\
| * Move update of the final optional ODE total frame stat inside the OdeLock rat...Justin Clark-Casey (justincc)2012-06-291-3/+3
| * refactor: rename _collisionEventPrim to m_collisionEventActors and _collision...Justin Clark-Casey (justincc)2012-06-291-12/+12
| * Fix a regression where we stopped removing avatars from collision event repor...Justin Clark-Casey (justincc)2012-06-291-1/+1
| * If a link points to a non-existing item in FetchInventory caps, then don't tr...Justin Clark-Casey (justincc)2012-06-291-1/+2
| * Add IScene.Name for code clarity to replace the RegionInfo.RegionName used in...Justin Clark-Casey (justincc)2012-06-294-32/+38
| * Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG direct...Justin Clark-Casey (justincc)2012-06-285-52/+58
| * Rather than iterating through all SOGs in the scene looking for the one that ...Justin Clark-Casey (justincc)2012-06-281-24/+17
| * Remove code that tried to delete an attachment back to inventory if RezSingle...Justin Clark-Casey (justincc)2012-06-281-6/+1
| * If rest of first line after colon is blank then still warn about running in X...Justin Clark-Casey (justincc)2012-06-281-11/+18
* | Merge branch 'avination' into careminsterMelanie2012-06-2911-46/+94
|\ \
| * | 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
| * | Comment out a spammy message that will spew 4 lines for each request to aMelanie2012-06-271-1/+2
| * | Add an event to the poll service manager thread to allow starting itMelanie2012-06-262-4/+14
| * | Disable physics raycast until it can be seen to. Fix distance calculationMelanie2012-06-261-2/+3
| * | 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
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-286-119/+59
* | | Merge branch 'master' into careminsterMelanie2012-06-2817-240/+507
|\ \ \ | | |/ | |/|
| * | Avoid reporting false positives when a colon is in a comment in the first lin...Justin Clark-Casey (justincc)2012-06-281-17/+41
| * | minor: reuse colon index calculation in XEngine.OnRezScript. The index if a ...Justin Clark-Casey (justincc)2012-06-281-2/+2
| * | Fix issue in InventoryArchiveTestCase where it didn't call down to OpenSimTes...Justin Clark-Casey (justincc)2012-06-271-1/+2
| * | refactor: Move ScenePresence <-> AgentData attachments copying code into Atta...Justin Clark-Casey (justincc)2012-06-274-37/+74
| * | Automatically disable log4net before each regression test so that logging is ...Justin Clark-Casey (justincc)2012-06-274-5/+50
| * | Replace "kill uuid" console command with the more consistent "delete object u...Justin Clark-Casey (justincc)2012-06-261-56/+0
| * | 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 loca...Justin Clark-Casey (justincc)2012-06-262-40/+31
| * | refactor: Use local attachment module variables instead of global m_attMod.Justin Clark-Casey (justincc)2012-06-261-11/+10
| * | refactor: make m_presence a local variable in all AttachmentsModuleTests sinc...Justin Clark-Casey (justincc)2012-06-261-26/+25
| * | Add regression test to check that attachments in source region are deleting w...Justin Clark-Casey (justincc)2012-06-262-18/+120
| * | 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 before...Justin Clark-Casey (justincc)2012-06-261-17/+26
| |/ /
| * | Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.Justin Clark-Casey (justincc)2012-06-262-6/+20
| * | Add "show regions" console command to ROBUST to show all regions currently re...Justin Clark-Casey (justincc)2012-06-261-0/+44
| * | Add "show region at" command to grid service to get the details of a region a...Justin Clark-Casey (justincc)2012-06-251-22/+69
| * | minor: update currently commented out log message at top of AvatarFactoryModu...Justin Clark-Casey (justincc)2012-06-251-1/+3
* | | Merge branch 'master' into careminsterMelanie2012-06-2617-143/+245
|\ \ \ | |/ /
| * | When attachments are being saved and deleted for a closing root agent, delete...Justin Clark-Casey (justincc)2012-06-254-29/+42
| * | In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove attachment...Justin Clark-Casey (justincc)2012-06-253-2/+42
| * | Fix script "Running" behaviorBlueWall2012-06-236-0/+53
| * | Resolve various race conditions between accessing and removing external scrip...Justin Clark-Casey (justincc)2012-06-221-132/+148
| * | Avoid a race condition where an incoming request to a script external URL can...Justin Clark-Casey (justincc)2012-06-223-40/+84
| * | Avoid race condition between m_PrimObjects iteration in XEngine.PostObjectEve...Justin Clark-Casey (justincc)2012-06-221-14/+14
| * | If starting scripts on initial sim start, provide INFO level log feedback eac...Justin Clark-Casey (justincc)2012-06-223-8/+12
| * | Eliminate unnecessary extra call to TriggerEmptyScriptCompileQueue in XEngine...Justin Clark-Casey (justincc)2012-06-221-9/+2
| * | Stop flicking IsAttachment false and then true in AttachmentsModule.UpdateAtt...Justin Clark-Casey (justincc)2012-06-221-10/+0