aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-04-191-0/+2
|\
| * Also enable scripts rezzed into primsMelanie2010-04-191-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-1912-69/+148
|\ \ | |/
| * All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-198-2/+46
| * refactor: move DeatchObject() into the AttachmentsModuleJustin Clark-Casey (justincc)2010-04-172-6/+14
| * refactor: remove now unused internal method SendAttachEvent()Justin Clark-Casey (justincc)2010-04-161-5/+0
| * refactor: crudely move DetachSingleAttachmentToGround() over to the Attachmen...Justin Clark-Casey (justincc)2010-04-163-33/+8
| * minor: correctly print out missing item id when it can't be found rather than...Justin Clark-Casey (justincc)2010-04-161-1/+0
| * refactor: crudely move the RezMultipleAttachments() method into the Attachmen...Justin Clark-Casey (justincc)2010-04-163-14/+16
| * Add --skip-assets option to load oar.Justin Clark-Casey (justincc)2010-04-161-2/+10
| * Reduce number of AvatarAnimations sent with large number of avatarsRobert Adams2010-04-132-6/+8
| * thanks lkalif for Mantis #4676 - a patch that adds support for inventory linksdahlia2010-04-122-0/+32
| * Partially implement share with group option for object inventory itemsJustin Clark-Casey (justincc)2010-04-053-2/+13
* | Merge branch 'master' into careminster-presence-refactorMelanie Thielker2010-04-191-6/+65
|\ \
| * | This GetScriptErrors() change allows initial XEngine to run in backgroundMike Rieker2010-04-181-6/+65
* | | Merge branch 'master' into careminster-presence-refactorMelanie Thielker2010-04-161-3/+9
|\ \ \ | |/ /
| * | Committing sacha's partial work (from orpheus). The GridBrat needs to learnMelanie2010-04-141-1/+1
| * | Change ISnmpModule to use scene referencesMelanie2010-04-141-2/+9
| * | Drop unused Alert() method from ISnmpModuleMelanie2010-04-131-2/+1
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-136-17/+144
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterlcc2010-04-105-13/+86
| |\ \
| | * | guarantee that a script engine's GetScriptErrors() will not be calledMike Rieker2010-04-103-12/+71
| | * | re-fixing this darn filelcc2010-04-101-0/+11
| | * | Fixing Traplcc2010-04-101-11/+0
| | * | Add Scene.SnmpService, which is of type ISnmpModule and, if nun-null, canMelanie2010-04-091-0/+14
| | * | Increase the amount of time we wait for a teleport to complete. This allows t...Thomas Grimshaw2010-04-071-1/+1
| * | | Adding ColdStart event lcc2010-04-101-0/+1
| * | | dding this deleted file...lcc2010-04-101-2/+2
| |/ /
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2010-04-051-22/+26
| |\ \
| | * | Fix up my own shoddy code! Fixes prim rez break. Whups!Thomas Grimshaw2010-04-051-22/+26
| * | | Add the ISnmpModule interface definition to Careminster releaseMelanie Thielker2010-04-051-0/+11
| |/ /
| * | Merge branch 'master' of ssh://TOR/var/git/careminsterThomas Grimshaw2010-04-054-43/+135
| |\ \
| | * | Fix some overlooked merge conflicts that got committedMelanie2010-04-051-10/+0
| * | | This commit adds some randomness to object persistence. It's a Work In Progre...Thomas Grimshaw2010-04-051-4/+42
| * | | Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 so...Thomas Grimshaw2010-04-051-1/+9
* | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-052-4/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-054-42/+144
| |\ \ \ | | |/ / | |/| |
| | * | Fix bug where approximately half the time, attachments would rez only their r...Justin Clark-Casey (justincc)2010-03-094-43/+138
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-03-192-26/+10
| |\ \ \
| | * | | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-182-26/+10
| * | | | Fix sit with autopilot.Kitto Flora2010-03-191-3/+5
| |/ / /
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-051-0/+73
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-014-2/+48
| |\ \ \
| | * | | Committing the LightShare code, which was developed by TomMeta of Meta7.Melanie2010-03-314-2/+48
| * | | | oops, add file missing from last commitJustin Clark-Casey (justincc)2010-04-011-0/+73
| |/ / /
* | | | Rename Meta7Windlight to LightShareMelanie2010-03-305-14/+13
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-3010-228/+324
|\ \ \ \ | |/ / /
| * | | Stab one bug. When joining an estate with a new region, make sure it's alsoMelanie2010-03-281-0/+2
| * | | * Fixed a bug with null value handling in WebUtil.BuildQueryString()John Hurliman2010-03-261-2/+4
| * | | Fixed a backwards null check that was preventing estate owner from being set ...John Hurliman2010-03-261-2/+2