Melanie
139e84c0b2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 01:01:02 +01:00
Melanie
7f99a8c900
Fix direct item give permissions
2011-01-12 16:20:38 +01:00
Melanie
2c6a410e90
Partial permissions fix for boxed items.
2011-01-10 22:02:22 +01:00
Melanie
c271bbcc8a
Preserve the script running flag when copying an object.
2011-01-08 16:44:28 +01:00
Melanie
1ab9cd0997
Fix a couple of security issues
2011-01-08 13:51:34 +01:00
Melanie
d1b6b4d288
Fix god mode perms adjustment
2011-01-06 19:12:25 +01:00
Melanie
75010e5e1c
Merge branch 'master' into careminster-presence-refactor
2010-12-25 00:04:46 +00:00
Diva Canto
3eaaaa0d99
One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.
2010-12-24 08:50:00 -08:00
Melanie
32cc569b00
Fix up some locking issues in task inventory. Don't use any prior versions in production!
2010-12-22 13:45:21 +01:00
Melanie
303c02133f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:00:01 +00:00
Melanie
1c3e77b728
What is the point of using different types to express the same damn thing?
2010-12-21 22:58:52 +00:00
Melanie
a70b597840
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:57:31 +00:00
Melanie
19181c019a
Another good catch. Update file name serial.
2010-12-21 22:56:48 +00:00
Melanie
da37ddff9f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:50:35 +00:00
Melanie
ec8d1d0131
Added a missed return. Thanks diva!
2010-12-21 22:49:38 +00:00
Melanie
a31b96e1ba
Fix up merge artifacts
2010-12-21 20:54:28 +00:00
Melanie
043dace118
Make prim inventories a bit more sane
2010-12-21 20:49:31 +00:00
Melanie
c9aa420c2d
Restore CM loking after core extract
2010-12-21 20:48:58 +00:00
Melanie
2f84f2171f
Make prim inventories a bit more sane
2010-12-21 20:47:00 +00:00
Melanie
7bb005b0d1
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 21:01:56 +00:00
Melanie
4f15b8d4e6
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 20:44:39 +01:00
Melanie
3d75e9addd
Lock the iteration over the inventory items when saving script states
2010-09-28 02:22:32 +02:00
Melanie
5b2aa02fd9
Merge branch 'master' into careminster-presence-refactor
2010-09-27 03:48:15 +01:00
Melanie
c2a4bdb2fe
Fix build break
2010-09-27 01:40:29 +01:00
Melanie
aaa4cb64a4
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-27 00:34:30 +01:00
Melanie
1c1f308052
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-24 23:48:52 +02:00
Melanie
7df4383235
Merge branch 'master' into careminster-presence-refactor
...
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
2010-09-17 03:49:30 +01:00
John Hurliman
5321e0e69f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-16 17:31:24 -07:00
John Hurliman
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
Justin Clark-Casey (justincc)
e3f1533705
Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}
2010-09-17 01:21:28 +01:00
root
1b2edfe75f
JustinCC is evil. f7b28dd3
broke script persistence. This fixes it.
2010-09-16 23:19:46 +01:00
root
a0c87b5af6
JustinCC is evil. f7b28dd3
broke script persistence. This fixes it.
2010-09-16 23:12:32 +02:00
meta7
1f74f013b2
Don't fart when deserializing a prim with no ParentGroup set yet
2010-09-15 07:59:28 -07:00
Melanie
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
John Hurliman
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
John Hurliman
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
Jeff Ames
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
John Hurliman
109b517583
Fixed the naming mess around data connectors for simulation data
2010-09-11 20:43:06 -07:00
Justin Clark-Casey (justincc)
f7b28dd321
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
2010-09-07 03:41:29 +01:00
Melanie Thielker
17a26c3701
Fix an issue with rezzing scripted objects.
2010-09-03 03:27:26 +01:00
Melanie Thielker
457160afc3
Fix an issue with rezzing scripted objects.
2010-09-03 03:16:08 +02:00
Melanie
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
Justin Clark-Casey (justincc)
df702417dc
Remove mono compiler warnings
2010-08-26 16:27:41 +01:00
Justin Clark-Casey (justincc)
8031f8ec09
Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking
2010-08-26 00:08:53 +01:00
Melanie
fc8d2be632
Merge branch 'master' into careminster-presence-refactor
...
This was rather conflicted. Please test linking.
2010-08-26 00:11:07 +01:00
Justin Clark-Casey (justincc)
46c6c35d48
refactor: Push item retrieval and fixing part of Scene.RezObject() down into SceneObjectPartInventory
2010-08-25 22:46:49 +01:00
Melanie Thielker
c48be64d9a
Remove posting region restart event from SOP, as it's now in XMRe
2010-08-06 16:08:50 +02:00
Tom
c5c6627adb
Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53 .
2010-08-06 02:40:31 -07:00
Diva Canto
f08afc4f87
Restore lines that have been removed due to previous merge conflict.
2010-07-20 14:28:17 -07:00
Melanie
4ccc141764
Resync with master
2010-07-20 21:49:31 +01:00