aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-04-191-32/+29
|\
| * Make script asset fetches synchronous. Script instantiation synchronizationMelanie2010-04-191-28/+24
| | | | | | | | will not work if the instance is not created when the method returns.
| * And some more rez modes that weren't covered beforeMelanie Thielker2010-04-191-0/+2
| |
* | And some more rez modes that weren't covered beforeMelanie Thielker2010-04-191-0/+2
| |
* | 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
| | | | | | | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable.
| * 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 ↵Justin Clark-Casey (justincc)2010-04-163-33/+8
| | | | | | | | AttachmentsModule
| * minor: correctly print out missing item id when it can't be found rather ↵Justin Clark-Casey (justincc)2010-04-161-1/+0
| | | | | | | | than a NullReferenceException
| * refactor: crudely move the RezMultipleAttachments() method into the ↵Justin Clark-Casey (justincc)2010-04-163-14/+16
| | | | | | | | AttachmentsModule
| * Add --skip-assets option to load oar.Justin Clark-Casey (justincc)2010-04-161-2/+10
| | | | | | | | | | This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker. This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation.
| * 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
| | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
| * Partially implement share with group option for object inventory itemsJustin Clark-Casey (justincc)2010-04-053-2/+13
| | | | | | | | | | | | If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off. If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active. However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway
* | 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
| | | | | | | | | | | | | | | thread. It should block only for the case of being called by CapsUpdateTaskInventoryScriptAsset().
* | | 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
| | | | | | | | | | | | a bit of git
| * | 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
| |\ \ | | | | | | | | | | | | | | | | | | | | resolved Conflicts: OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
| | * | guarantee that a script engine's GetScriptErrors() will not be calledMike Rieker2010-04-103-12/+71
| | | | | | | | | | | | | | | | | | | | until after its OnRezScript() returns so that script compile error messages can be retrieved
| | * | 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
| | | | | | | | | | | | | | | | be used to send snmp alerts
| | * | Increase the amount of time we wait for a teleport to complete. This allows ↵Thomas Grimshaw2010-04-071-1/+1
| | | | | | | | | | | | | | | | teleportation to a remote region without a local connection to the asset server without timing out.
| * | | 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 ↵Thomas Grimshaw2010-04-051-4/+42
| | | | | | | | | | | | | | | | Progress, I am working on improving this to a tiered approach.
| * | | Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 ↵Thomas Grimshaw2010-04-051-1/+9
| | | | | | | | | | | | | | | | so it can be reverted then.
* | | | 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 ↵Justin Clark-Casey (justincc)2010-03-094-43/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. Backport from head.
| * | | 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
| | | | | | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | This allows scripts to set WindLight parameters for clients connecting to a region. Currently, this is only supported by the Meta7 viewer.
| * | | | oops, add file missing from last commitJustin Clark-Casey (justincc)2010-04-011-0/+73
| |/ / / | | | | | | | | | | | | refactor out redundant method from GroupsMessagingModule
* | | | Rename Meta7Windlight to LightShareMelanie2010-03-305-14/+13
| | | |