Justin Clark-Casey (justincc)
ff429a259b
Fix bug where an avatar that had an object they owned attached through llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene.
...
This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All
Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
2012-05-23 01:58:10 +01:00
Melanie
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
Justin Clark-Casey (justincc)
01b00ad0d5
Fire the scripting changed event with CHANGED_OWNER when an object that has changed owners is rezzed.
...
This needs to occur after the script is resumed rather than before, when the event is just dropped.
Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
2012-05-05 00:29:14 +01:00
Melanie
e6e12c2d42
Merge branch 'avination'
2012-05-02 00:32:28 +02:00
Melanie
98e9f22544
Preserve attachment rotation on objects rezzed via a script. Makes toasters
...
work right, finally.
2012-05-02 00:29:56 +02:00
Melanie
fe65b51876
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-13 03:00:48 +01:00
Talun
08e509978d
Mantis 55025 Implement script time.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-12 18:44:00 -07:00
Melanie
67d4f1d66c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IScriptModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-09 21:40:03 +01:00
Talun
78c0028179
Mantis5502 implementation of some of the new constants
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-04-09 21:25:22 +01:00
Melanie
f3132c45d9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
Justin Clark-Casey (justincc)
32a953fed7
refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.
2012-03-31 01:52:06 +01:00
Melanie
ed67b698d3
Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-03-22 23:05:58 +00:00
Justin Clark-Casey (justincc)
c4b2d24f33
Add llGiveInventory() test from object to object where both objects are owned by the same user.
2012-03-22 22:17:07 +00:00
Melanie
37049180f6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-07 21:09:04 +00:00
Justin Clark-Casey (justincc)
038d1bf742
Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText().
...
The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory.
Later path concatenation is already done by Path.Combine() which handles any trailing slash.
Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
2012-02-07 17:44:37 +00:00
Melanie
567f4c51f8
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:52:17 +00:00
Melanie
45ad9e39a6
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:05:14 +01:00
Melanie
dc612d0f08
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-11-28 11:06:38 +00:00
Justin Clark-Casey (justincc)
0688861aa7
Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conversion rather than the arrays in TaskInventoryItem
2011-11-25 22:15:29 +00:00
Melanie
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
Justin Clark-Casey (justincc)
b0fe0464af
Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines.
...
This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry.
Callers adjusted to stop checking for the list reference being null (which never happened anyway)
2011-11-22 22:13:57 +00:00
Melanie
534560df8c
Remove backup optimization that was causing prim contents to poof
2011-11-05 23:31:20 +01:00
Melanie
f6ea36b4fa
Fix a missing locking call
2011-10-25 03:15:28 +02:00
Melanie
cc1fe354d0
Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 21:21:44 +01:00
Melanie
7d2a3dc174
Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 20:57:31 +01:00
Justin Clark-Casey (justincc)
de19dc3024
refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to reflect what it actually does
...
This also makes it consistent with some other methods that send data to the client.
2011-09-15 18:58:58 +01:00
Justin Clark-Casey (justincc)
a4cc5f628f
Only bother to create an inventory xfer file if there are any items in a prim inventory
2011-09-15 18:42:10 +01:00
Justin Clark-Casey (justincc)
8fb3e71b14
Shuffle order of code in invnetory connector GetFolderContent() calls to avoid a possible race condition
2011-09-15 18:36:22 +01:00
Justin Clark-Casey (justincc)
42f1b88eb2
If a prim inventory becomes empty through deletion, send an empty xfer file name rather than one that references a metadata file containing only the folder object.
...
If we do this, then viewer 3 crashes when we try and rez a script directly in an attachment's prim inventory.
Sending an empty file name was already being done if the prim's inventory had never been touched.
Now we always do that if there are no items in that inventory.
Hopefully addresses the remaining point in http://opensimulator.org/mantis/view.php?id=5644
2011-09-15 18:13:36 +01:00
Tom
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
Justin Clark-Casey (justincc)
8880aea728
Stop attempts to rewear already worn items from removing and reattaching.
...
Viewer 2/3 will sometimes attempt to rewear attachments, even though they have already been attached during the main login process.
This change ignores those attempts.
This stops script failures during login, as the rewearing was racing with the script startup code.
It might also help with attachments being abnormally put into deleted state.
Hopefully resolves some more of http://opensimulator.org/mantis/view.php?id=5644
2011-09-13 22:13:58 +01:00
Tom
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
095b3e5756
Remove pointless cluttering SOP.ParentGroup != null checks.
...
The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database.
At all other times it's not possible for a SOP not to have a SOG parent.
2011-09-01 01:22:28 +01:00
Justin Clark-Casey (justincc)
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
Melanie
27891fddcf
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-30 14:23:20 +02:00
Melanie
d1cf1fe3d7
Merge branch 'master' into careminster-presence-refactor
2011-04-30 14:37:37 +01:00
Melanie
98fe37051a
Set the attachment data on scripted rez to allow toasters to work.
2011-04-30 14:22:46 +02:00
Justin Clark-Casey (justincc)
cd7517ccb9
Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.
...
Addresses http://opensimulator.org/mantis/view.php?id=5444
Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct.
This did not effect scripts.
2011-04-28 22:59:12 +01:00
Melanie
3a113f9902
A stab at making CHANGED_OWNER work
2011-04-01 22:04:29 +01:00
Melanie
95e524dde1
A stab at making CHANGED_OWNER work
2011-04-01 18:49:53 +02:00
Melanie
3dc877c59f
Merge branch 'master' into careminster-presence-refactor
2011-03-14 14:48:00 +00:00
Justin Clark-Casey (justincc)
b821f748ac
For objects loaded from an IAR, make sure the CreatorID points towards the OSP resolved ID if newer CreationData is not present.
...
This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account.
This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see.
This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file).
This is for IAR loading only. Tests updated to check this behaviour.
2011-03-10 21:56:15 +00:00
Melanie
b91c99b596
Fix script data not being reset as it should be
2011-01-24 03:07:01 +00:00
Melanie
649d9ef934
Fix script data not being reset as it should be
2011-01-24 02:20:54 +01:00
Justin Clark-Casey (justincc)
3083c517a0
minor: resolve some mono compiler warnings
2011-01-18 00:29:10 +00:00
Melanie
30320077a2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 03:20:47 +00:00
Melanie
139e84c0b2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 01:01:02 +01:00
Melanie
914e4b319e
Fix direct item give permissions
2011-01-12 21:39:13 +00:00
Melanie
7cfe17b5b3
Partial permissions fix for boxed items.
2011-01-12 21:25:38 +00:00
Melanie
dd154f7403
Fix god mode perms adjustment
2011-01-12 21:21:34 +00: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
Melanie
c0b8cbd85b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:47:53 +01:00