aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-021-0/+1
| | | | work right, finally.
* Merge branch 'master' into careminsterMelanie2012-03-311-1/+1
|\ | | | | | | | | | | | | | | 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
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return ↵Justin Clark-Casey (justincc)2012-03-311-1/+1
| | | | | | | | the 'root' part.
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-221-3/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add llGiveInventory() test from object to object where both objects are ↵Justin Clark-Casey (justincc)2012-03-221-3/+3
| | | | | | | | owned by the same user.
* | Merge branch 'master' into careminsterMelanie2012-02-071-8/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Add a regression test to compile and start a script. Remove ↵Justin Clark-Casey (justincc)2012-02-071-8/+4
| | | | | | | | | | | | | | | | 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.
| * Improve reliability of script state saving by covering various savingMelanie2012-02-021-10/+16
| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | Improve reliability of script state saving by covering various savingMelanie2012-02-021-9/+15
| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | Merge branch 'master' into bigmergeMelanie2011-11-281-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() ↵Justin Clark-Casey (justincc)2011-11-251-2/+2
| | | | | | | | conversion rather than the arrays in TaskInventoryItem
* | Merge branch 'master' into bigmergeMelanie2011-11-241-5/+5
|\ \ | |/
| * Stop an exception being thrown and a teleport/border cross failing if the ↵Justin Clark-Casey (justincc)2011-11-221-5/+5
| | | | | | | | | | | | | | 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)
* | Remove backup optimization that was causing prim contents to poofMelanie2011-11-051-3/+8
| |
* | Fix a missing locking callMelanie2011-10-251-0/+1
| |
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-2/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to ↵Justin Clark-Casey (justincc)2011-09-151-1/+1
| | | | | | | | | | | | reflect what it actually does This also makes it consistent with some other methods that send data to the client.
| * Only bother to create an inventory xfer file if there are any items in a ↵Justin Clark-Casey (justincc)2011-09-151-2/+2
| | | | | | | | prim inventory
| * Shuffle order of code in invnetory connector GetFolderContent() calls to ↵Justin Clark-Casey (justincc)2011-09-151-1/+1
| | | | | | | | avoid a possible race condition
* | Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmergeMelanie2011-10-111-0/+11
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * If a prim inventory becomes empty through deletion, send an empty xfer file ↵Justin Clark-Casey (justincc)2011-09-151-20/+43
| | | | | | | | | | | | | | | | | | 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
* | Bring us up to date.Tom2011-09-141-0/+5
|\ \ | |/
| * Stop attempts to rewear already worn items from removing and reattaching.Justin Clark-Casey (justincc)2011-09-131-0/+5
| | | | | | | | | | | | | | | | 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
* | Resolve merge commits, stage 1Tom2011-09-041-4/+7
|\ \ | |/
| * Remove pointless cluttering SOP.ParentGroup != null checks.Justin Clark-Casey (justincc)2011-09-011-4/+6
| | | | | | | | | | 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.
| * refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid ↵Justin Clark-Casey (justincc)2011-08-271-1/+1
| | | | | | | | pointless duplication of identical values
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-04-301-0/+3
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-0/+3
| |\ \ | | |/
| | * Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.Justin Clark-Casey (justincc)2011-04-281-2/+5
| | | | | | | | | | | | | | | | | | 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.
| | * A stab at making CHANGED_OWNER workMelanie2011-04-011-5/+5
| | |
* | | Set the attachment data on scripted rez to allow toasters to work.Melanie2011-04-301-0/+3
|/ /
* | A stab at making CHANGED_OWNER workMelanie2011-04-011-5/+5
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-141-2/+6
|\ \ | |/
| * For objects loaded from an IAR, make sure the CreatorID points towards the ↵Justin Clark-Casey (justincc)2011-03-101-2/+6
| | | | | | | | | | | | | | | | | | 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.
| * Fix script data not being reset as it should beMelanie2011-01-241-0/+4
| |
| * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2011-01-181-1/+1
| |
| * Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
| |
| * Fix direct item give permissionsMelanie2011-01-121-6/+16
| |
| * Partial permissions fix for boxed items.Melanie2011-01-121-0/+7
| |
| * Fix god mode perms adjustmentMelanie2011-01-121-0/+2
| |
* | Fix script data not being reset as it should beMelanie2011-01-241-0/+4
| |
* | Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
| |
* | Fix direct item give permissionsMelanie2011-01-121-6/+16
| |
* | Partial permissions fix for boxed items.Melanie2011-01-101-10/+8
| |
* | Preserve the script running flag when copying an object.Melanie2011-01-081-0/+34
| |
* | Fix a couple of security issuesMelanie2011-01-081-3/+9
| |
* | Fix god mode perms adjustmentMelanie2011-01-061-0/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-251-3/+6
|\ \ | |/
| * One more pass at object inventory. This time, fix SceneObjectPartInventory ↵Diva Canto2010-12-241-68/+68
| | | | | | | | 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.
* | Fix up some locking issues in task inventory. Don't use any prior versions ↵Melanie2010-12-221-0/+2
| | | | | | | | in production!
generated by cgit v1.1 at 2024-12-19 15:17:09 +0000