Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| | * | minor: add method doc to sop.SetScriptEvents() | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -0/+5 |
| | | | |||||
| | * | minor: add some documentation to EventManager.OnObjectGrab | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -15/+8 |
| | | | |||||
| | * | minor: add reminder to lock SOG.Children before using it directly in order ↵ | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -2/+5 |
| | | | | | | | | | | | | to avoid threading issues | ||||
| * | | allow terrain collision events after regular collision check | radams1 | 2010-02-03 | 1 | -3/+3 |
| |/ | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-02 | 8 | -31/+351 |
|\ \ | |||||
| * | | Revert "improve locking of m_items in SceneObjectPartInventory" | Melanie | 2010-02-02 | 1 | -133/+85 |
| |/ | | | | | | | This reverts commit 968b9e160d70568fbdea5b190d1386e9431316e3. | ||||
| * | minor: rename GetScriptPrimType() to GetPrimType() | Justin Clark-Casey (justincc) | 2010-02-01 | 1 | -2/+2 |
| | | |||||
| * | move hollow sphere faces bug back up to LSL_Api.cs | Justin Clark-Casey (justincc) | 2010-02-01 | 1 | -1/+1 |
| | | |||||
| * | remove now duplicated shape code from LSL_Api.cs | Justin Clark-Casey (justincc) | 2010-02-01 | 1 | -4/+4 |
| | | |||||
| * | Copy prim face color setting code from LSL_Api down into SOP so that non-LSL ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 1 | -0/+192 |
| | | | | | | | | callers can use it | ||||
| * | Actually make EventManager.OnAttach() fire when an object is attached. ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -2/+6 |
| | | | | | | | | Previously, only detach was firing! | ||||
| * | Don't try to start attachment scripts or send updates if the attachment ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -27/+64 |
| | | | | | | | | itself has been unsuccessful | ||||
| * | Apply http://opensimulator.org/mantis/view.php?id=3334 | Justin Clark-Casey (justincc) | 2010-01-29 | 3 | -0/+52 |
| | | | | | | | | | | | | Send continuous touch() events if the left mouse button is held down while moving over an object This conforms with Linden Lab practice Thanks Revolution |