aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-1133-305/+891
|\
| * If a part has a sit target and an avatar is already sitting, allow another av...Justin Clark-Casey (justincc)2012-07-101-7/+4
| * refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ...Justin Clark-Casey (justincc)2012-07-102-5/+6
| * Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-102-8/+3
| * refactor: Add SOP.IsSitTargetOccupied to improve readabilityJustin Clark-Casey (justincc)2012-07-102-3/+8
| * refactor: use sit orientation argument passed in to SP.SendSitResponse() rath...Justin Clark-Casey (justincc)2012-07-101-4/+2
| * Move common code to detect whether a part has a valid sit target into a SOP p...Justin Clark-Casey (justincc)2012-07-102-30/+20
| * Remove log line accidentally left in SP.SendSitResponse()Justin Clark-Casey (justincc)2012-07-101-1/+1
| * Disable logging in regression test in OSSL_ApiAttachmentTestsJustin Clark-Casey (justincc)2012-07-101-1/+1
| * Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ava...Justin Clark-Casey (justincc)2012-07-102-6/+32
| * When an attachment is detached to inv or derezzed, stop the scripts, update t...Justin Clark-Casey (justincc)2012-07-105-13/+110
| * If a script is being stopped manually, then give the scriptpool thread 1 seco...Justin Clark-Casey (justincc)2012-07-101-1/+5
| * This script allows an object to be attached directly from prim inventory to a...Justin Clark-Casey (justincc)2012-07-094-5/+96
| * Don't allow a prim to be sat upon if its part of an attachmentJustin Clark-Casey (justincc)2012-07-091-0/+9
| * Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-097-26/+229
| * minor: rearrange INITIALIZATION COMPLETE log message so that it's clear init ...Justin Clark-Casey (justincc)2012-07-071-3/+2
| * minor: remove some recent mono compiler warningsJustin Clark-Casey (justincc)2012-07-072-3/+1
| * Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xmlJustin Clark-Casey (justincc)2012-07-071-1/+0
| * minor: Make WORLD MAP category log lines consistentJustin Clark-Casey (justincc)2012-07-071-4/+4
| * minor: Get RegionReady module to shout initialization complete status to draw...Justin Clark-Casey (justincc)2012-07-071-1/+3
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-074-58/+107
| |\
| | * Merge branch 'bulletsim2'Robert Adams2012-07-064-58/+107
| | |\
| | | * Clean up collision reporting code so they are properly passed toRobert Adams2012-07-064-58/+107
| * | | Remove redundant SetScene() function in Scene.AddSceneObject()Justin Clark-Casey (justincc)2012-07-077-29/+34
| |/ /
| * | Remove now duplicate interregion object check that should have been removed a...Justin Clark-Casey (justincc)2012-07-061-12/+0
| * | minor: Remove some wrong comments in attachments regression testsJustin Clark-Casey (justincc)2012-07-061-2/+0
| |/
| * Add assert to attachment regression tests to check that number of objects in ...Justin Clark-Casey (justincc)2012-07-063-5/+38
| * Mantis 6077 trim NPC chat on channel zero.Talun2012-07-061-0/+8
| * Mantis 6063 osNpcTouch.Talun2012-07-066-0/+98
| * Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from ...Justin Clark-Casey (justincc)2012-07-061-14/+27
| * refactor: extract method UpdateUserInventoryWithAttachment() from AttachObjec...Justin Clark-Casey (justincc)2012-07-061-29/+38
| * Log MONO_THREADS_PER_CPU value on simulator startup, or "unset" if it is not setJustin Clark-Casey (justincc)2012-07-061-2/+6
| * Log warning if time between invocations of the watchdog thread is twice the t...Justin Clark-Casey (justincc)2012-07-051-2/+22
* | Merge branch 'avination' into careminsterMelanie2012-07-0619-117/+587
|\ \
| * | added llSetVelocity. will refuse to work on vehicles and on attachments ( th...UbitUmarov2012-07-064-1/+57
| * | Changed GetTexture error code RequestedRangeNotSatisfiable to NotFound, since...UbitUmarov2012-07-061-1/+3
| * | Convert the slow request queue into a regular queue and add some cleanupMelanie2012-07-061-4/+18
| * | Fix the boo-booMelanie2012-07-051-3/+3
| * | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-054-16/+39
| * | use the pollEvent timeout paramenter on poolingUbitUmarov2012-07-041-4/+7
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ...UbitUmarov2012-07-044-5/+8
| * | *test2* http poll: increased again the pool rate do 10/s but increased timeou...UbitUmarov2012-07-041-2/+2
| * | *test* slow http retries pool rate to original 1sUbitUmarov2012-07-041-1/+1
| * | Merge branch 'ubitwork' into avinationMelanie2012-07-023-11/+244
| |\ \
| | * | *TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued ...UbitUmarov2012-07-012-0/+206
| | * | Merge branch 'avination' into ubitworkUbitUmarov2012-07-012-4/+3
| | |\ \
| | * | | ubitode: create and use 4 off world collision spaces for offworld static primsUbitUmarov2012-06-301-11/+38
| * | | | Implement the buggy version of llXorBase64Strings() for compatibility's sakeMelanie2012-07-021-3/+84
| * | | | Bring casing of llSHA1String in line with SLMelanie2012-07-011-1/+1
| | |/ / | |/| |
| * | | Remove spammy debugMelanie2012-06-291-1/+1