Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | minor: comment out friends number logging from login for now | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -1/+1 | |
| | ||||||
* | Fix bug where attachments were remaining on the avatar after being dropped. | Justin Clark-Casey (justincc) | 2011-08-30 | 3 | -8/+25 | |
| | | | | If the inventory service is configured not to allow deletion then these will not disappear from inventory | |||||
* | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-30 | 8 | -24/+168 | |
|\ | ||||||
| * | Fix bug in persisting saved appearances for npcs | Justin Clark-Casey (justincc) | 2011-08-30 | 8 | -24/+168 | |
| | | | | | | | | | | Assets have to be marked non-local as well as non-temporary to persist. This is now done. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660 | |||||
* | | Use GetMeshKey from PrimitiveBaseShape. | Robert Adams | 2011-08-29 | 2 | -15/+23 | |
| | | ||||||
* | | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-29 | 22 | -229/+266 | |
|\ \ | |/ | ||||||
| * | Move GetMeshKey from buried inside Meshmerizer to a public method on ↵ | Robert Adams | 2011-08-28 | 2 | -62/+62 | |
| | | | | | | | | | | | | PrimitiveBaseShape Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | Add level of detail specification to optionally reduce the number of ↵ | Robert Adams | 2011-08-28 | 2 | -5/+42 | |
| | | | | | | | | | | | | vertices in generated prim meshes Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | Related to #4689 - Adding missing null check for SceneObjectPart | Makopoppo | 2011-08-27 | 2 | -4/+18 | |
| | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | Stop avatars returning from neighbouring regions from stalling on the border ↵ | Justin Clark-Casey (justincc) | 2011-08-27 | 1 | -3/+22 | |
| | | | | | | | | | | | | | | | | | | crossing. On making a root agent, we need to reset the ScenePresence.m_movement_flag so that it doesn't remember the movement registered to the client when it exited the initial region. If this is remember, then the client avatar movement isn't updated and it appears to stall in mid-air, though this is resolved with a prod/release of any other direction key. This bug was probably introduced a few weeks ago. Surprised that nobody brought it up. | |||||
| * | Eliminate duplicate AttachmentPoint properties by always using the one ↵ | Justin Clark-Casey (justincc) | 2011-08-27 | 4 | -44/+41 | |
| | | | | | | | | stored in the root part's state field. | |||||
| * | refactor: camel case AttachmentPoint method arg as per code standards | Justin Clark-Casey (justincc) | 2011-08-27 | 1 | -4/+4 | |
| | | ||||||
| * | refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid ↵ | Justin Clark-Casey (justincc) | 2011-08-27 | 16 | -113/+83 | |
| | | | | | | | | pointless duplication of identical values | |||||
* | | BulletSim: add mesh representation. Use meshes for static objects and switch ↵ | Robert Adams | 2011-08-26 | 3 | -129/+228 | |
| | | | | | | | | to hulls for physical objects. | |||||
* | | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-26 | 33 | -564/+997 | |
|\ \ | |/ | ||||||
| * | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar | Justin Clark-Casey (justincc) | 2011-08-26 | 7 | -27/+26 | |
| | | | | | | | | This does a tiny bit to reduce code complexity, memory requirement and the cpu time of pointlessly setting this field to the same value in every SOP | |||||
| * | refactor: move SOG.DetachToGround() to ↵ | Justin Clark-Casey (justincc) | 2011-08-26 | 2 | -41/+35 | |
| | | | | | | | | AttachmentsModule.DetachSceneObjectToGround() and remove redundant code | |||||
| * | refactor: simplify DetachSingleAttachmentToGround() by retrieving the scene ↵ | Justin Clark-Casey (justincc) | 2011-08-26 | 2 | -11/+12 | |
| | | | | | | | | object group direct | |||||
| * | refactor: remove common presence set up in attachments tests | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -32/+38 | |
| | | ||||||
| * | comment out verbose test logging from last commit | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -1/+1 | |
| | | ||||||
| * | add regression test for detaching an attachment to the scene | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -0/+33 | |
| | | ||||||
| * | refactor: move sog.DetachToInventoryPrep() into ↵ | Justin Clark-Casey (justincc) | 2011-08-26 | 3 | -36/+23 | |
| | | | | | | | | AttachmentsModule.DetachSingleAttachmentToInv() | |||||
| * | Downgrade warning about not saving unchanged attachment to debug instead, ↵ | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -1/+4 | |
| | | | | | | | | and change text to better indicate what it's saying | |||||
| * | Fix a very recent regression from llAttachToAvatar() fix where I ↵ | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -5/+1 | |
| | | | | | | | | accidentally stopped normal script state persistence on login/logout and attach/detach | |||||
| * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2011-08-25 | 2 | -51/+111 | |
| |\ | ||||||
| | * | llSetPrimitiveParams correct prim hollow for cases where limit should be 70%. | Micheil Merlin | 2011-08-25 | 2 | -51/+111 | |
| | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | | Remove forcing of phantom on ground attached objects - attachments can be ↵ | Justin Clark-Casey (justincc) | 2011-08-24 | 3 | -7/+2 | |
| | | | | | | | | | | | | | | | | | | both non-phantom and flagged as physical. As per Melanie | |||||
| * | | remove pointless IsDeleted check on SP.RezAttachments() | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | IsDeleted is never set for an SP, even though it's on EntityBase. It might be an idea to set it in the future | |||||
| * | | refactor: simplify EntityBase.IsDeleted property | Justin Clark-Casey (justincc) | 2011-08-24 | 3 | -10/+5 | |
| | | | ||||||
| * | | extend initial rez regression test to check that attachment is phantom | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -9/+14 | |
| | | | ||||||
| * | | Make objects attached from the ground phantom | Justin Clark-Casey (justincc) | 2011-08-24 | 2 | -2/+12 | |
| | | | ||||||
| * | | add SOG helper properties IsPhantom, IsTemporary, etc. to improve code ↵ | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -20/+46 | |
| | | | | | | | | | | | | | | | | | | readability use these in some sog methods | |||||
| * | | return InventoryItemBase from AddSceneObjectAsAttachment() | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -8/+4 | |
| | | | ||||||
| * | | refactor: move Scene.Inventory.attachObjectAssetStore() into ↵ | Justin Clark-Casey (justincc) | 2011-08-24 | 2 | -86/+100 | |
| | | | | | | | | | | | | AttachmentsModule.AddSceneObjectAsAttachment() | |||||
| * | | get rid of pointless grp null check in attachObjectAssetStore() | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -73/+69 | |
| | | | ||||||
| * | | minor: remove hardcoded region numbers with the region size constant and a ↵ | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | currently hardcoded offset | |||||
| * | | refactor: remove pointless AgentId argument from attachObjectAssetStore() | Justin Clark-Casey (justincc) | 2011-08-24 | 2 | -2/+2 | |
| | | | ||||||
| * | | add TestAddAttachmentFromGround() regression test | Justin Clark-Casey (justincc) | 2011-08-24 | 2 | -2/+32 | |
| |/ | ||||||
| * | Fix llAttachToAvatar() | Justin Clark-Casey (justincc) | 2011-08-24 | 6 | -24/+80 | |
| | | | | | | | | | | | | Apart from one obvious bug, this was failing because attempting to serialize the script from inside the script (as part of saving the attachment as an inventory asset) was triggering an extremely long delay. So we now don't do this. The state will be serialized anyway when the avatar normally logs out. The worst that can happen is that if the client/server crashes, the attachment scripts start without previous state. | |||||
| * | rename AttachmentsModule.ShowDetachInUserInventory() to ↵ | Justin Clark-Casey (justincc) | 2011-08-23 | 4 | -23/+14 | |
| | | | | | | | | DetachSingleAttachmentToInv() for consistency and to reflect it's actual behaviour | |||||
| * | remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-08-23 | 9 | -16/+4 | |
| | | ||||||
| * | replace TestRemoveAttachments() with a more thorough TestRemoveAttachment() | Justin Clark-Casey (justincc) | 2011-08-23 | 1 | -51/+27 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-08-23 | 1 | -3/+10 | |
| |\ | ||||||
| | * | Protect a check for default texture entry when setting alpha values. Apparently | Mic Bowman | 2011-08-23 | 1 | -3/+10 | |
| | | | | | | | | | | | | if all faces have their own textures then the default texture is null | |||||
| * | | replace old TestAddAttachments() with a more thorough TestAddAttachment() | Justin Clark-Casey (justincc) | 2011-08-23 | 1 | -7/+28 | |
| |/ | ||||||
| * | Remove pointless contains check in ScenePresence.RemoveAttachment() | Justin Clark-Casey (justincc) | 2011-08-23 | 1 | -6/+1 | |
| | | ||||||
| * | If an object failed to attach due to an exception, then try and detach it ↵ | Justin Clark-Casey (justincc) | 2011-08-23 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | from the avatar's list of attachments as well as delete it from the scene. This may help with the "Inconsistent attachment state" errors seen on teleport. See http://opensimulator.org/mantis/view.php?id=5644 and linked reports | |||||
| * | If an attachment fails, then start logging the exception for now, in order ↵ | Justin Clark-Casey (justincc) | 2011-08-22 | 3 | -61/+84 | |
| | | | | | | | | | | | | to help with the inconsistent state bug. This also refactors AttachmentsModules to stop pointlessly refetching the ScenePresence in various methods. However, more of this is required. | |||||
| * | Add warning log message to say which attachment fails validation in order to ↵ | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -0/+10 | |
| | | | | | | | | pin down problems with "Inconsistent Attachment State" | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -3/+1 | |
| | |