953611af53
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-08-30 22:07:32 +01:00
e7a515bab0
Fix bug where attachments were remaining on the avatar after being dropped.
...
If the inventory service is configured not to allow deletion then these will not disappear from inventory
2011-08-30 22:06:24 +01:00
b705ad477e
BulletSim: update values in OpenSimDefaults.ini to the same as defaults in the source.
2011-08-30 13:49:50 -07:00
b281163457
BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read.
2011-08-30 13:19:53 -07:00
17dab7245f
Merge branch 'master' into bulletsim
2011-08-30 08:44:28 -07:00
be357f8fee
Fix bug in persisting saved appearances for npcs
...
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
2011-08-30 01:58:32 +01:00
96dce3e16c
Use GetMeshKey from PrimitiveBaseShape.
2011-08-29 10:10:48 -07:00
648866b597
Merge branch 'master' into bulletsim
2011-08-29 09:55:34 -07:00
18037d41c4
Move GetMeshKey from buried inside Meshmerizer to a public method on PrimitiveBaseShape
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-28 16:50:54 -04:00
80a2b81d52
Add level of detail specification to optionally reduce the number of vertices in generated prim meshes
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-28 16:49:25 -04:00
795b56e695
Related to #4689 - Adding missing null check for SceneObjectPart
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-27 07:45:02 -04:00
d4d894c20f
Stop avatars returning from neighbouring regions from stalling on the border 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.
2011-08-27 01:28:33 +01:00
1615e7d29f
Eliminate duplicate AttachmentPoint properties by always using the one stored in the root part's state field.
2011-08-27 00:33:24 +01:00
b7700428ec
refactor: camel case AttachmentPoint method arg as per code standards
2011-08-27 00:20:15 +01:00
33a894f3d2
refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid pointless duplication of identical values
2011-08-27 00:15:21 +01:00
21708b832b
BulletSim: add mesh representation. Use meshes for static objects and switch to hulls for physical objects.
2011-08-26 15:51:21 -07:00
23f10f1d22
Merge branch 'master' into bulletsim
2011-08-26 15:23:46 -07:00
15a514fcbc
refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar
...
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
2011-08-26 23:06:41 +01:00
5f3ffc195f
refactor: move SOG.DetachToGround() to AttachmentsModule.DetachSceneObjectToGround() and remove redundant code
2011-08-26 22:49:11 +01:00
ae614c1264
refactor: simplify DetachSingleAttachmentToGround() by retrieving the scene object group direct
2011-08-26 22:37:53 +01:00
040ad11e61
refactor: remove common presence set up in attachments tests
2011-08-26 22:24:51 +01:00
dc61bf4b1f
comment out verbose test logging from last commit
2011-08-26 22:17:27 +01:00
1dba047e4d
add regression test for detaching an attachment to the scene
2011-08-26 22:17:05 +01:00
002313bf13
refactor: move sog.DetachToInventoryPrep() into AttachmentsModule.DetachSingleAttachmentToInv()
2011-08-26 22:02:23 +01:00
fcbed6479a
Downgrade warning about not saving unchanged attachment to debug instead, and change text to better indicate what it's saying
2011-08-26 21:46:12 +01:00
6c692d2e21
Fix a very recent regression from llAttachToAvatar() fix where I accidentally stopped normal script state persistence on login/logout and attach/detach
2011-08-26 21:26:29 +01:00
04d42860fe
Merge branch 'master' of /home/opensim/src/opensim
2011-08-25 07:01:57 -04:00
cf42fcd978
llSetPrimitiveParams correct prim hollow for cases where limit should be 70%.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-25 06:50:55 -04:00
4b4c5e69e5
Remove forcing of phantom on ground attached objects - attachments can be both non-phantom and flagged as physical.
...
As per Melanie
2011-08-24 22:45:51 +01:00
d5dc8133fc
remove pointless IsDeleted check on SP.RezAttachments()
...
IsDeleted is never set for an SP, even though it's on EntityBase.
It might be an idea to set it in the future
2011-08-24 22:37:08 +01:00
6d4432f440
refactor: simplify EntityBase.IsDeleted property
2011-08-24 22:34:26 +01:00
21f1b68fdf
extend initial rez regression test to check that attachment is phantom
2011-08-24 22:25:23 +01:00
73d913dad2
Make objects attached from the ground phantom
2011-08-24 22:12:51 +01:00
9ba4511d3e
add SOG helper properties IsPhantom, IsTemporary, etc. to improve code readability
...
use these in some sog methods
2011-08-24 21:53:12 +01:00
801b7f18a7
return InventoryItemBase from AddSceneObjectAsAttachment()
2011-08-24 21:40:36 +01:00
5eeee480d4
refactor: move Scene.Inventory.attachObjectAssetStore() into AttachmentsModule.AddSceneObjectAsAttachment()
2011-08-24 21:35:44 +01:00
274e354006
get rid of pointless grp null check in attachObjectAssetStore()
2011-08-24 21:23:10 +01:00
0e0d40c810
minor: remove hardcoded region numbers with the region size constant and a currently hardcoded offset
2011-08-24 21:18:11 +01:00
ccf07f6ae3
refactor: remove pointless AgentId argument from attachObjectAssetStore()
2011-08-24 21:14:57 +01:00
b9ec625dbf
add TestAddAttachmentFromGround() regression test
2011-08-24 21:07:46 +01:00
cf3ffe5bb4
Fix llAttachToAvatar()
...
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.
2011-08-24 20:49:23 +01:00
97b207240e
rename AttachmentsModule.ShowDetachInUserInventory() to DetachSingleAttachmentToInv() for consistency and to reflect it's actual behaviour
2011-08-23 22:05:22 +01:00
014cd4f8bb
remove mono compiler warnings
2011-08-23 21:41:16 +01:00
805ba268d5
replace TestRemoveAttachments() with a more thorough TestRemoveAttachment()
2011-08-23 21:37:36 +01:00
4a101080ee
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-08-23 21:21:02 +01:00
34aed96a2f
replace old TestAddAttachments() with a more thorough TestAddAttachment()
2011-08-23 21:20:23 +01:00
ce011d7e44
Protect a check for default texture entry when setting alpha values. Apparently
...
if all faces have their own textures then the default texture is null
2011-08-23 10:52:12 -07:00
afd5469eec
Remove pointless contains check in ScenePresence.RemoveAttachment()
2011-08-23 00:08:29 +01:00
1f3ce48be1
If an object failed to attach due to an exception, then try and detach it 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
2011-08-23 00:04:38 +01:00
d328046efb
If an attachment fails, then start logging the exception for now, in order 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.
2011-08-22 23:59:48 +01:00
Justin Clark-Casey (justincc)