Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2010-04-05 | 1 | -22/+26 |
|\ | |||||
| * | Fix up my own shoddy code! Fixes prim rez break. Whups! | Thomas Grimshaw | 2010-04-05 | 1 | -22/+26 |
| | | |||||
* | | Add the ISnmpModule interface definition to Careminster release | Melanie Thielker | 2010-04-05 | 1 | -0/+11 |
|/ | |||||
* | Merge branch 'master' of ssh://TOR/var/git/careminster | Thomas Grimshaw | 2010-04-05 | 4 | -43/+135 |
|\ | |||||
| * | Fix some overlooked merge conflicts that got committed | Melanie | 2010-04-05 | 1 | -10/+0 |
| | | |||||
| * | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 4 | -42/+144 |
| |\ | |||||
| | * | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-09 | 4 | -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 Grimshaw | 2010-04-05 | 1 | -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 Grimshaw | 2010-04-05 | 1 | -1/+9 |
|/ / | | | | | | | so it can be reverted then. | ||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-03-19 | 2 | -26/+10 |
|\ \ | |||||
| * | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 2 | -26/+10 |
| | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. | ||||
* | | | Fix sit with autopilot. | Kitto Flora | 2010-03-19 | 1 | -3/+5 |
|/ / | |||||
* | | RotLookAt repaired; debug msg cleanup. | Kitto Flora | 2010-03-14 | 2 | -35/+4 |
| | | |||||
* | | Resolved merge | Kitto Flora | 2010-03-12 | 15 | -226/+761 |
|\ \ | |||||
| * \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 15 | -210/+761 |
| |\ \ | | |/ | |||||
| | * | - implementing server 1.38 functions | unknown | 2010-03-06 | 1 | -0/+5 |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | Formatting cleanup. | Jeff Ames | 2010-02-22 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-16 | 15 | -208/+716 |
| | |\ | |||||
| | | * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 9 | -102/+102 |
| | | | | |||||
| | | * | Fixes a bug in the previous patch. | Revolution | 2010-02-15 | 1 | -18/+13 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | | * | Plug a small hole | Melanie | 2010-02-14 | 1 | -0/+3 |
| | | | | |||||
| | | * | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 9 | -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-16 | 2 | -11/+26 |
| | |/ | | | | | | | | | | instead of void | ||||
* | | | Dynamics Integration Part 1 | Kitto Flora | 2010-03-11 | 1 | -1/+10 |
|/ / | |||||
* | | Allow particles and texture anims to be persisted to XML. This behaviour is ↵ | CasperW | 2010-02-25 | 1 | -2/+0 |
| | | | | | | | | expected. | ||||
* | | Disable blocking teleports within the same parcel for now; it's not ↵ | CasperW | 2010-02-25 | 1 | -2/+4 |
| | | | | | | | | implemented correctly. Will review soon. | ||||
* | | Plug a small hole | Melanie | 2010-02-15 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-14 | 2 | -1/+2 |
|\ \ | |/ | |||||
| * | Fix http://opensimulator.org/mantis/view.php?id=4224 | Justin Clark-Casey (justincc) | 2010-02-12 | 2 | -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 careminster | Melanie | 2010-02-08 | 7 | -43/+147 |
|\ \ | |/ | |||||
| * | add some method doc to IDynamicTextureManager | Justin Clark-Casey (justincc) | 2010-02-08 | 1 | -2/+59 |
| | | |||||
| * | refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in ↵ | Justin Clark-Casey (justincc) | 2010-02-08 | 2 | -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-08 | 4 | -17/+58 |
| | | | | | | | | | | | | incoming scene object Add a read-only Attachments property to ScenePresence | ||||
| * | minor: log what kind of wearable cannot be found | Justin Clark-Casey (justincc) | 2010-02-05 | 1 | -3/+2 |
| | | |||||
| * | refactor: chain two ScenePresence constructors together to eliminate common ↵ | Justin Clark-Casey (justincc) | 2010-02-04 | 1 | -15/+11 |
| | | | | | | | | code. No functional changes | ||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-04 | 2 | -17/+15 |
| |\ | |||||
| * | | minor: one method doc | Justin Clark-Casey (justincc) | 2010-02-04 | 1 | -3/+7 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2010-02-04 | 3 | -335/+1168 |
|\ \ \ | | |/ | |/| | |||||
| * | | Revert "change position of OnAttach event firing so that this also happens ↵ | Melanie | 2010-02-04 | 2 | -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/opensim | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -3/+3 |
| |\ | |||||
| * | | minor: add a smidgen of EventManager doc | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -6/+6 |
| | | | |||||
| * | | For each delegate added to events in the EventManager, catch and log but do ↵ | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -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 sop | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -1/+24 |
| | | | |||||
| * | | minor: comment out a log line in ScenePresence | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -2/+1 |
| | | | |||||
| * | | minor: remove a couple of mono warnings | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -4/+1 |
| | | | |||||
| * | | change position of OnAttach event firing so that this also happens when a ↵ | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -15/+17 |
| | | | | | | | | | | | | user teleports into a region | ||||
* | | | Line endings cleanup | Melanie | 2010-02-04 | 1 | -36/+36 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2010-02-03 | 4 | -20/+60 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-02-03 | 4 | -17/+57 |
| |\ \ | | |/ | |||||
| | * | minor: copy some method doc from the WorldComm implementation to the interface | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -0/+39 |
| | | |