aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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.
* | | 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 '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
|/ /
* | RotLookAt repaired; debug msg cleanup.Kitto Flora2010-03-142-35/+4
| |
* | Resolved mergeKitto Flora2010-03-1215-226/+761
|\ \
| * \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-0615-210/+761
| |\ \ | | |/
| | * - implementing server 1.38 functionsunknown2010-03-061-0/+5
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | * Formatting cleanup.Jeff Ames2010-02-221-1/+1
| | |
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-1615-208/+716
| | |\
| | | * Formatting cleanup.Jeff Ames2010-02-159-102/+102
| | | |
| | | * Fixes a bug in the previous patch.Revolution2010-02-151-18/+13
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | | * Plug a small holeMelanie2010-02-141-0/+3
| | | |
| | | * Revolution is on the roll again! :)Revolution2010-02-149-106/+616
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events). Direct flames and kudos to Revolution, please Signed-off-by: Melanie <melanie@t-data.com>
| | * | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object ↵Justin Clark-Casey (justincc)2010-02-162-11/+26
| | |/ | | | | | | | | | instead of void
* | | Dynamics Integration Part 1Kitto Flora2010-03-111-1/+10
|/ /
* | Allow particles and texture anims to be persisted to XML. This behaviour is ↵CasperW2010-02-251-2/+0
| | | | | | | | expected.
* | Disable blocking teleports within the same parcel for now; it's not ↵CasperW2010-02-251-2/+4
| | | | | | | | implemented correctly. Will review soon.
* | Plug a small holeMelanie2010-02-151-0/+3
| |
* | Merge branch 'master' into careminsterMelanie2010-02-142-1/+2
|\ \ | |/
| * Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-122-1/+2
| | | | | | | | | | | | | | This resolves the problem where eyes and hair would turn white on standalone configurations When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it. This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white. This bug did not affect grids since they use a different service connector.
* | Merge branch 'master' into careminsterMelanie2010-02-087-43/+147
|\ \ | |/
| * add some method doc to IDynamicTextureManagerJustin Clark-Casey (justincc)2010-02-081-2/+59
| |
| * refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in ↵Justin Clark-Casey (justincc)2010-02-082-5/+12
| | | | | | | | Scene.AddSceneObject since this wraps a check that is much less clear
| * Add EventManager.OnIncomingSceneObject event which is triggered by an ↵Justin Clark-Casey (justincc)2010-02-084-17/+58
| | | | | | | | | | | | incoming scene object Add a read-only Attachments property to ScenePresence
| * minor: log what kind of wearable cannot be foundJustin Clark-Casey (justincc)2010-02-051-3/+2
| |
| * refactor: chain two ScenePresence constructors together to eliminate common ↵Justin Clark-Casey (justincc)2010-02-041-15/+11
| | | | | | | | code. No functional changes
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-042-17/+15
| |\
| * | minor: one method docJustin Clark-Casey (justincc)2010-02-041-3/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2010-02-043-335/+1168
|\ \ \ | | |/ | |/|
| * | Revert "change position of OnAttach event firing so that this also happens ↵Melanie2010-02-042-17/+15
| |/ | | | | | | | | | | | | | | when a user teleports into a region" The behavior introduced here is not compatible with SL This reverts commit b6bee4999c9d238a052022f105069ea4eb85f8f4.
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-031-3/+3
| |\
| * | minor: add a smidgen of EventManager docJustin Clark-Casey (justincc)2010-02-032-6/+6
| | |
| * | For each delegate added to events in the EventManager, catch and log but do ↵Justin Clark-Casey (justincc)2010-02-031-314/+1128
| | | | | | | | | | | | | | | | | | not propogate any exceptions that come back This stops exceptions thrown by modules from disrupting the kernel and still allows other delegates to be executed normally
| * | add an IsRoot property to sopJustin Clark-Casey (justincc)2010-02-032-1/+24
| | |
| * | minor: comment out a log line in ScenePresenceJustin Clark-Casey (justincc)2010-02-031-2/+1
| | |
| * | minor: remove a couple of mono warningsJustin Clark-Casey (justincc)2010-02-032-4/+1
| | |
| * | change position of OnAttach event firing so that this also happens when a ↵Justin Clark-Casey (justincc)2010-02-032-15/+17
| | | | | | | | | | | | user teleports into a region
* | | Line endings cleanupMelanie2010-02-041-36/+36
| | |
* | | Merge branch 'master' into careminsterMelanie2010-02-034-20/+60
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-02-034-17/+57
| |\ \ | | |/
| | * minor: copy some method doc from the WorldComm implementation to the interfaceJustin Clark-Casey (justincc)2010-02-021-0/+39
| | |