a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
4ad1468165
Better handling of invalid XML: a) prevent infinite loop on EOF; b) better logging
...
If the XML was truncated for some reason then ExecuteReadProcessors() would get into an infinite loop, using high CPU. Now it detects EOF (and several other error cases) and aborts.
The rest of the changes just improve logging of XML in case of errors, so that we can see what the bad XML is.
2015-08-11 07:35:37 +01:00
959872315f
WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum.
...
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
2015-08-08 12:12:50 -07:00
e5a1243abc
Mantis #7657 and #7514 . This should alleviate the problem of bad object assets being passed around via HG and archives. No guarantees that all the leaks have been found, but at least it detects and fixes these bad assets upon:
...
(1) storing and getting assets over HG -- assuming the core HG asset service is being used (not the case with OSGrid!)
(2) importing assets via OAR and IAR
Instantiation of bad assets now should also work, instead of producing an exception, but the bad assets themselves aren't being fixed in the DB. That should be done with a cleaning tool -- see Perl script in Mantis #7657 .
Virus!
2015-08-01 18:58:05 -07:00
03f142730c
Squoosh one more warning
2015-06-14 08:14:09 -07:00
83267e19f6
Mantis #7536 . This may alleviate the side effects of broken SceneObjects XML. It doesn't (can't) fix the cause.
2015-06-04 16:17:45 -07:00
07dead7dcb
varregion: any conversions of use of Constants.RegionSize converted into
...
Util.cs routines to convert region coords to and from world coords or handles.
2015-03-29 14:25:12 -07:00
2482d567cf
added missing senderId in GiveInventoryFolder this little mistake prevented passing on folders for HG visitors
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-02 15:59:49 -05:00
25dd30ddb6
minor: Fix some CR line endings in Scene.Inventory.cs
2015-01-21 00:33:54 +00:00
e2dd15625f
Added GetDisplayNames capability. For now, we don't actually use display names, and this cap returns the regular name. But this moves the server side into the newer, preferred, protocol used by the viewer for fetching the names of agents in the scene given their UUIDs. (the old protocol is via UDP). This works fine in my limited tests, but could use further testing by others.
2015-01-09 08:31:56 -08:00
bb82076a4d
Allow for richer semantics of object derez. Specifically, allow the existence of region modules that do other kinds of garbage collection. Instead of placing deleted objects in the user's Trash folder, or deleting them immediately (UseTrashOnDelete = false), a module may decide to take garbage collection under its control. For example, it may place derezzed objects in a certain area inworld and delete them later.
2014-12-25 12:17:07 -08:00
e8d67af3e1
change/fix rez position and rotation on llRezObject and llRezAtRoot
2014-11-27 23:32:24 +00:00
bb5ab05482
fix rez position being for root or center for a single object case
2014-11-19 18:20:30 +00:00
7bcb68d7c4
some steps to rez center or root of prim inventory object at requested
...
position ( does nothing diferent still )
2014-11-19 16:59:11 +00:00
b4a91f5dde
return bbox and offsetHeight to RezObject
2014-11-19 16:43:56 +00:00
5aa8ba1b45
Fix issue where llRemoteLoadScriptPin() would treat 0 (the default) as a valid set pin in a destination prim rather than the unset no pin state
...
Adds regression test for this case.
2014-11-11 17:59:56 +00:00
fdb0598446
remove duplicated lines
2014-11-08 00:25:44 +00:00
30f3de549a
Merge branch 'avination-current'
2014-10-30 01:32:36 +01:00
3afd64f2f7
Fix a script load issue
2014-10-30 01:29:03 +01:00
14259b5f99
Fix an obscure permissions exploit. Taking items from a friend's prim could
...
possibly result in a privilege escalation
2014-10-16 03:53:56 +02:00
04612f41a7
Fix transferring inventory from prims to agent inventory
2014-10-16 03:46:45 +02:00
4ae960a4f0
bug fix: revert back check on creating link
2014-10-04 03:43:20 +01:00
09e05d48b9
refuse to do a inventory link if provided asset type is not a link or
...
folderlink
2014-09-26 13:28:24 +01:00
d29a04fc20
remove debug msgs
2014-09-26 03:52:10 +01:00
598ab37b97
debug msg
2014-09-26 02:52:44 +01:00
8e15d4ad57
limit number of prims on physical objects. Not all cases covered still
2014-09-08 23:58:49 +01:00
1b75ec5647
Ignore whitespace when reading serialized XML objects.
...
This was previously effectively being done by XmlDocument in the multiple passes through the XML.
This change tells XmlReader to ignore whitespace. This also means changing arguments to use XmlReader instead of XmlTextReader (a descendent of XmlReader) directly.
XmlReader.Create() has been the recommend way to create XML readers since .NET 2.0 as per MS SDK and is the only way to specific ignore whitespace settings.
2014-08-29 19:08:23 +01:00
f132f642b2
On code section that rezzes single objects and attachments, reduce CPU use by reading asset XML a single time with a stream reader rather than multiple times.
...
Reading large XML documents (e.g. complex attachments) is CPU expensive - this must be done as few times as possible (preferably just once).
Reading these documents into XmlDocument is also more resource intensive than using XmlTextReader, as per Microsoft's own publication "Improve .NET Application Performance and Scalability"
Optimization of other cases will follow if this change is successful.
2014-08-28 18:15:33 +01:00
c80322f1e6
dont change agentItem.BasePermissions where avination-current didn't
...
change
2014-08-05 19:03:11 +01:00
dc717303d4
replace old Attachoffset by AttachedPos. Comented out possible merge
...
artifacts
2014-07-20 01:15:33 +01:00
95b89dd450
fix attachments
2014-07-19 22:18:12 +02:00
ab1472e5b7
Don't trigger ItemUploaded when no item has been uploaded.
2014-05-18 23:01:55 -07:00
922f76a3a7
Don't fetch assets from the server when doing simple inventory operations like copy-paste items in inventory.
2014-05-18 07:49:01 -07:00
f4cba27105
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-07 17:00:12 -07:00
614b9e14c4
When moving an item from a prim to a user's inventory, don't delete the item from the prim until it was successfully copied to the user
2014-05-06 07:28:46 +01:00
eb79c882ea
Show more meaningful error messages when failed to move an item from a prim to a user's inventory.
...
Also, actually show the error to the user in more cases. (Previously, sometimes the operation failed without telling the user anything.)
2014-05-06 07:28:45 +01:00
1e5cff32fc
Show more meaningful error messages when failed to give an item to another user
2014-05-06 07:28:44 +01:00
13b2ac1425
Makes it possible to support grids in which all the simulators share all central services of a Robust server EXCEPT assets. In other words, grids where the simulators' assets are kept in one DB and the users' inventory assets
...
are kept on another. When users rez items from inventory or take objects from world, an HG-like asset copy takes place between the 2 servers, the world asset server and the user's asset server. This makes the simulators independent of the central asset server.
Note that this an advanced configuration and requires some security strengthening coming up.
2014-05-04 20:54:42 -07:00
1d9a9e6004
Fixes a long-standing bug related to god-mode change ownership of objects permissive, where the permissions of the children prims' inventory items were not changed. As a consequence, we couldn't control some of the objects imported via HG and OARs even in god mode.
2014-04-24 14:11:42 -07:00
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
1cf17a3cf7
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
2014-01-11 08:52:23 -08:00
91fd9c4670
Refactored: use a single function to apply an object's folded permissions to its main permissions
2014-01-10 19:50:03 +00:00
e5f7c8b6e8
varregion: add lots of DEBUG level log messages. Especially for teleport.
2013-12-24 12:31:26 -08:00
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
d0c1780839
Fixed rezzing coalesced objects from a prim's inventory
...
Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
2013-10-15 23:59:16 +01:00
75c68fa29e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
2dc92e7de1
Preserve attachment point & position when attachment is rezzed in world
...
Patch taken from
http://opensimulator.org/mantis/view.php?id=4905
originally by Greg C.
Fixed to apply to r/23314 commit
ba9daf849e
2013-09-22 21:10:01 -05:00
2603a2891b
Reinsert comments about possible race conditions when sending bulk inventory updates on non-flag clothing editing
2013-09-16 23:26:13 +01:00
aa7f4215a9
Merge branch 'master' into careminster
2013-08-18 03:00:32 +01:00
UbitUmarov