Commit Graph

15380 Commits (8568c6a7c038a8f49b926d44ca5324c741c80c98)

Author SHA1 Message Date
Melanie Thielker d665f0ae66 Detach attachments displaced by other attachments 2010-07-14 20:46:26 +02:00
Diva Canto b8aa81635f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-14 11:04:57 -07:00
Diva Canto 12858122d5 Fixes mantis #4870. 2010-07-14 11:02:41 -07:00
Melanie Thielker bebbe407ee Major attachments cleanup. Remove unused AttachObject ClientView method
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:58:23 +02:00
Melanie Thielker 0c445239a6 Remove useless quaternion parameter from AttachObject sig 2010-07-14 19:21:01 +02:00
Justin Clark-Casey (justincc) 5b03e05035 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-14 17:55:06 +01:00
Justin Clark-Casey (justincc) 5d83b3f991 comment out obsolete assert that 'item has been passed to another user since it was last set' perms flag was set when a prim item was added to a scene object 2010-07-14 17:53:43 +01:00
Justin Clark-Casey (justincc) 0080c3b1f4 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-14 17:13:04 +01:00
Justin Clark-Casey (justincc) 71433075a9 Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars 2010-07-14 17:12:12 +01:00
Melanie 2291daa95a Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-07-14 16:13:21 +01:00
Diva Canto e17591f4cf Cleaned up a couple of things from OpenSim.ini.example: [Friends] section has been in other inis for a while, not needed here; and [Network] remoteDataPort is obsolete. 2010-07-14 08:52:22 -07:00
Melanie Thielker 39cd57598b Fix a permissions issue 2010-07-14 16:12:44 +01:00
Melanie d1f94b5d58 Merge branch 'master' into careminster-presence-refactor 2010-07-14 16:12:14 +01:00
Melanie Thielker cbb3a8ab94 Fix a permissions issue 2010-07-14 16:21:55 +02:00
Melanie 33aa7ba7dc Revert "More on mantis #4869. This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing."
Cuauses a permission escalation. do NOT USE the preceding commit
2010-07-14 14:59:34 +01:00
Diva Canto bec1d7cc36 Removed left-over debug messages. 2010-07-14 07:00:24 -07:00
Diva Canto 87fb19162e More on mantis #4869. This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing. 2010-07-14 06:57:56 -07:00
Diva Canto d64c09160c Removed some more debug messages. 2010-07-14 04:18:13 -07:00
Melanie Thielker cd8bb316ea Remove getting the object capacity from the money module. It is now set
directly from the Region Info (and the region ini file)
2010-07-14 03:51:00 +01:00
Melanie Thielker af13c80d68 Remove getting the object capacity from the money module. It is now set
directly from the Region Info (and the region ini file)
2010-07-14 03:59:26 +02:00
Justin Clark-Casey (justincc) e44e1ccbd3 implement code to deregister users on DeregisterCaps 2010-07-14 00:16:37 +01:00
Justin Clark-Casey (justincc) a4c6c4de91 implement serverside checks for media texture navigation in order to stop naughty clients 2010-07-13 23:58:19 +01:00
Justin Clark-Casey (justincc) 2ad9789b1c factor out soon to be common media permissions check code 2010-07-13 23:46:49 +01:00
Tom Grimshaw c5891c14c7 Bail out in AttachToBackup if the group is an attachment 2010-07-13 15:32:35 -07:00
Justin Clark-Casey (justincc) 6f644f5322 implement prim media control permissions serverside in order to stop bad clients 2010-07-13 23:19:45 +01:00
Tom Grimshaw 7270cd0ade Second part of the fix for llGetLocalPos; get attachment offset in the root prim of an attachment. This function now behaves in line with SL. 2010-07-13 14:57:50 -07:00
sacha 8c2e1c6c29 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-13 21:12:01 +00:00
sacha 8c26c8bbc6 adding the 'wearble' case for llGetLocalPos.
Still not working cause the offsets are not updated (always <0,0,0>)
2010-07-13 21:10:26 +00:00
Kitto Flora 84227fd558 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-13 20:37:45 +00:00
Kitto Flora 7ab103c96f Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes occasional collision event failure. ChOde only. 2010-07-13 20:37:13 +00:00
Melanie eacf3d9221 Merge branch 'master' into careminster-presence-refactor 2010-07-13 20:46:21 +01:00
Melanie dd14016885 Revamp the permissions propagation. This MAY mess up. Please test.
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:45:16 +01:00
Melanie Thielker bed36901d1 Add CreateSelected flag onto objects rezzed from inventory 2010-07-13 20:37:12 +01:00
Melanie Thielker 89c1c5c35a Revamp the permissions propagation. This MAY mess up. Please test.
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:40:23 +02:00
Justin Clark-Casey (justincc) 1a1d42db83 discard an object media update message if it tries to set more media textures than the prim has faces 2010-07-13 19:28:07 +01:00
Melanie Thielker 31cbd6d113 Add CreateSelected flag onto objects rezzed from inventory 2010-07-13 18:23:23 +02:00
Justin Clark-Casey (justincc) 86f3f83250 uncomment a load iar code line I accidentally commented in the last commit
hooray for automated tests
2010-07-12 23:37:08 +01:00
Justin Clark-Casey (justincc) 3156f4bbeb comment out a lot of the debug log messages when loading an iar
these are very redundant now and cause issues when loading large iars
diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
2010-07-12 23:00:01 +01:00
Justin Clark-Casey (justincc) 55caab1efd Fire CHANGED_MEDIA event if a media texture is set or cleared 2010-07-12 22:27:11 +01:00
Justin Clark-Casey (justincc) 4b0c5711b5 implement llClearPrimMedia()
untested
2010-07-12 22:00:45 +01:00
Tom Grimshaw 5f4105d48c Removed the CHANGED_COLOR event post from the Color accessor in SOP. This is not the correct usage of this changed event - it's only supposed to be posted when the /textures/ change colour or alpha transparency, not the floating text. This fixes several race conditions in scripts ported from SL. 2010-07-12 13:55:56 -07:00
Justin Clark-Casey (justincc) 01ff3c9f9f fix issue with GetMediaEntry if the face requested wasn't set to a media texture 2010-07-12 21:43:36 +01:00
Justin Clark-Casey (justincc) d4684da8bd fix problem persisting when only one face had a media texture 2010-07-12 21:33:27 +01:00
Justin Clark-Casey (justincc) 7691a638e3 factor out common code for updating the media url 2010-07-12 20:18:10 +01:00
Justin Clark-Casey (justincc) 9231fc0f31 factor out common face parameter checking code 2010-07-12 20:15:10 +01:00
Justin Clark-Casey (justincc) 312eb5e42e minor: correct a few method names and change accessability 2010-07-12 19:48:20 +01:00
Justin Clark-Casey (justincc) 4a92046b58 implement llSetPrimMediaParams()
Untested
2010-07-12 19:46:23 +01:00
Justin Clark-Casey (justincc) 7e3c54213c Implement llGetPrimMediaParams()
Exposes method to get media entry via IMoapModule
As yet untested.
2010-07-12 15:49:09 +01:00
Melanie Thielker 26621ca500 Add scripted controllers into agent intersim messaging 2010-07-11 14:50:14 +01:00
Melanie Thielker 7f0f11304f Add scripted controllers into agent intersim messaging 2010-07-11 14:26:57 +02:00