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
Melanie
c0b8cbd85b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:47:53 +01:00
Melanie
dcf7973c9b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:39:20 +01:00
Melanie
176cb01130
Remove a merge artefact
2010-07-20 21:38:31 +01:00
Melanie
686837d9ed
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:18:27 +01:00
Melanie Thielker
78605baab3
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-20 21:00:56 +01:00
Diva Canto
7c124a5543
Relaxed the ultra-conservative lock on m_items. Needs testing under linux and stress.
2010-07-20 05:59:18 -07:00
Diva Canto
cd2bb7daf3
Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests indicate that this is what causes deadlock. More tests needed.
2010-07-19 08:07:37 -07:00
Melanie
a974704a3e
re-add the sleep lost in the revert.
2010-07-19 14:37:27 +01:00
Melanie
575f7d3366
Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage"
...
This reverts commit c404c5fb54
.
2010-07-19 14:36:53 +01:00
Melanie Thielker
8d2b4b7b48
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-15 20:03:08 +02: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
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)
be0af01061
Revert "stop exceptions in setting and getting state from propogating since they aren't fatal to operations"
...
This reverts commit 94cb6fc916
.
2010-06-29 23:43:38 +01:00
Justin Clark-Casey (justincc)
94cb6fc916
stop exceptions in setting and getting state from propogating since they aren't fatal to operations
...
this will hopefully stop "save oar" from failing if a script asset is corrupt
2010-06-29 21:08:09 +01:00
Melanie
e94cf3d9b7
And another conflict
2010-06-24 03:35:42 +01:00
Melanie
e93853623b
Merge branch 'master' into careminster-presence-refactor
2010-06-24 03:30:11 +01:00
Melanie
c404c5fb54
Thank you, Snoopy, for a patch to reduce sim script startup CPU usage
2010-06-23 21:14:28 +01:00
Melanie
65f03af38f
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 07:34:55 +01:00
Melanie
57a60282f5
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 06:57:10 +01:00
Tom Grimshaw
14a86de115
Fix another ReaderWriterLockSlim issue
2010-05-10 12:45:33 -07:00
Melanie Thielker
9c8d7d34b3
Fix a bug in owner change notification
2010-05-03 04:55:41 +02:00
Melanie
1494c84f56
Fix a bug in owner change notification
2010-05-03 02:40:52 +01:00
Melanie
9f8acbfe3e
Merge branch 'master' into careminster-presence-refactor
2010-05-03 01:40:24 +01:00
Melanie
45301d8a49
Defer sending of CHANGED_OWNER to make it work on rezzed objects and
...
attachments in addition to objects sold in place
2010-05-03 01:14:38 +01:00
Melanie
edde0be0a0
Fix build break.
2010-04-27 01:11:14 +01:00
Melanie Thielker
06661708b4
Add a parameter to prim inventory update to prevent event firing
2010-04-27 02:40:30 +02:00
Melanie
6928ec0240
Add a parameter to prim inventory update to prevent event firing
2010-04-27 00:25:29 +01:00
Melanie Thielker
81ff5eaba0
Make scripted attachment states work. Finally. Also replace two monitor locks
...
with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
2010-04-25 22:03:35 +02:00
Melanie Thielker
31e0704c8d
Remove debug output, the culprit has been identified
2010-04-23 17:48:50 +02:00
Melanie Thielker
780630d7c0
Fix a nullref in attachment handling. Add some debug to find the attachment
...
state issue
2010-04-23 14:41:20 +02:00
Justin Clark-Casey (justincc)
6b963e73d9
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-19 21:28:30 +01:00
Justin Clark-Casey (justincc)
524a2a9e26
Make the "notecard saved" text appear in the saver rather than the notecard owner, if the notecard is saved by a permitted group member
...
This means moving the alert up to a place where the IClientAPI is available.
One can also argue that such client messages shouldn't be sent directly from the scene data model
2010-04-19 21:25:59 +01:00
Melanie
d2e4f2d376
Merge branch 'master' into careminster-presence-refactor
2010-04-19 15:33:20 +01:00
Melanie
3e63ce6d9d
Make script asset fetches synchronous. Script instantiation synchronization
...
will not work if the instance is not created when the method returns.
2010-04-19 15:29:35 +01:00
Melanie
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
Melanie
21cad5d3ac
All scripts are now created suspended and are only unsuspended when the object
...
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
2010-04-19 06:29:26 +01:00
Melanie Thielker
72d380acf0
Merge branch 'master' into careminster-presence-refactor
2010-04-19 06:10:23 +02:00
Mike Rieker
68a4f897b4
This GetScriptErrors() change allows initial XEngine to run in background
...
thread. It should block only for the case of being called by
CapsUpdateTaskInventoryScriptAsset().
2010-04-18 19:19:16 -04:00
Melanie
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
Mike Rieker
0b2b2daf23
guarantee that a script engine's GetScriptErrors() will not be called
...
until after its OnRezScript() returns so that script compile error
messages can be retrieved
2010-04-10 14:43:26 -04:00
Justin Clark-Casey (justincc)
9ecad50419
Partially implement share with group option for object inventory items
...
If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off.
If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active.
However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway
2010-04-05 19:37:02 +01:00
Melanie
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
Melanie
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
Justin Clark-Casey (justincc)
e07548d703
move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it
2010-03-04 20:08:25 +00:00
Melanie
028a87fe37
Merge branch 'master' into careminster-presence-refactor
...
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
Melanie
1f45e6c649
Merge branch 'master' into presence-refactor
...
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
Jeff Ames
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
Melanie
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
Justin Clark-Casey (justincc)
da62344822
minor: remove a couple of mono warnings
2010-02-03 15:40:59 +00:00
Melanie
d5ed92cf38
Merge branch 'master' into careminster
2010-02-02 03:56:29 +00:00
Melanie
6478617c93
Revert "improve locking of m_items in SceneObjectPartInventory"
...
This reverts commit 968b9e160d
.
2010-02-02 03:49:00 +00:00
Justin Clark-Casey (justincc)
968b9e160d
improve locking of m_items in SceneObjectPartInventory
2010-01-29 20:36:13 +00:00
Justin Clark-Casey (justincc)
ae2174d8f5
Add method to get all items with the same name from a particular prim
...
Extend load oar test to check loading of a sound item
2010-01-29 18:11:53 +00:00
Melanie
e9c9a74e0a
Some merge fixups
2010-01-26 15:12:41 +00:00
Melanie
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
Justin Clark-Casey (justincc)
38cfc9366c
Fix a problem where llDie() calls were sometimes leaving dead objects behind.
...
When an object was deleted, the remove script instance call was aggregating the scripting events as normal.
This would queue a full update of the prim before the viewer was notifed of the deletion of that prim (QuitPacket)
On some occasions, the QuitPacket would be sent before the full update was dequeued and sent.
In principle, you would think that a viewer would ignore updates for deleted prims. But it appears that in the Linden viewer (1.23.5),
a prim update that arrives after the prim was deleted instead makes the deleted prim persist in the viewer. Such prims have no properties
and cannot be removed from the viewer except by a relog.
This change stops the prim event aggregation call if it's being deleted anyway, hence removing the spurious viewer-confusing update.
2010-01-25 21:51:58 +00:00
Diva Canto
c5ea783526
OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.
2010-01-11 07:51:33 -08:00
root
b53b871669
Add a data path for error messages
2009-12-22 06:25:32 +01:00
root
05e8b4e72c
Add a data path for error messages
...
Committed from my other box where git is not configured properly
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-22 04:55:43 +00:00
Melanie
84a1a0a729
Merge branch 'master' into careminster
2009-12-21 22:07:22 +00:00
Melanie
32904c0ce8
When a script has been loaded, remove it's state entry, so recompiling
...
doesn't pick up the old state again.
2009-12-21 22:05:43 +00:00
Melanie
df30b1c832
Merge branch 'master' into careminster
2009-12-21 10:28:50 +00:00
Melanie
27453890d5
Script State Fix: Part 2
...
Change the reader to wrap old-style definitions in new style wrappers.
Change importer to not check irrelevant data that can't be reconstructed
This removes the last bit of knowledge of XEngine's .state files from core.
2009-12-21 10:26:52 +00:00
CasperW
172e2f4e76
Fix to existing ReaderWriterLockSlim implementations
2009-12-06 17:23:07 +01:00
Melanie
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
Justin Clark-Casey (justincc)
f7b2f0e61e
Add position and region of prim items with missing assets in log reports
2009-12-02 18:15:33 +00:00
Melanie
06f41bb017
Merge branch 'master' into careminster
2009-11-26 17:27:03 +00:00
Melanie
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
Melanie
22c325aa5a
Remove GetAssemblyName and friends from the SE interface. It's now handled
...
internally
2009-11-26 13:13:48 +00:00
Melanie
88842edc95
Remove GetAssemblyName and friends from the SE interface. It's now handled
...
internally
2009-11-26 12:08:20 +00:00
CasperW
8383bde768
Removed some extra debug chatter
2009-11-24 18:18:19 +01:00
CasperW
d114713694
Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lock handler. This gives us:
...
- Faster prim inventory actions. Multiple threads can read at once.
- Fixes the known prim inventory thread locks
- In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console
2009-11-24 18:02:12 +01:00
John Hurliman
45dc4e0a54
* Added a sanity check to GetScriptAssemblies() and GetScriptStates() for the case where no scripting engine is enabled
...
* Added TokenBucket.cs to OpenSim, with some fixes for setting a more accurate MaxBurst value and getting a more accurate Content value (by Drip()ing each get)
2009-10-20 18:19:17 -07:00