UbitUmarov
2a38210fe9
serialize the new variables
2020-01-22 22:01:05 +00:00
UbitUmarov
6e2b5ac238
fix identation
2019-11-23 01:21:36 +00:00
UbitUmarov
14270e316a
fix xml decode of kfm in single prims case
2019-11-23 01:17:03 +00:00
UbitUmarov
ef43111fc1
another missing file
2019-01-21 06:41:01 +00:00
UbitUmarov
d841c593b9
add a bit more persistence (still mysql only)
2018-12-31 09:54:54 +00:00
UbitUmarov
707eb8de82
remove more xml things no longer needed on .net >4.5.2
2018-01-17 07:17:24 +00:00
UbitUmarov
029d6e40f6
remove those xml things no longer needed on .net >4.5.2
2018-01-17 04:18:43 +00:00
UbitUmarov
b903287dd1
Merge branch 'master' into httptests
2018-01-16 17:17:44 +00:00
UbitUmarov
c92ba1cc04
shut up some pesty warnings
2018-01-15 16:23:19 +00:00
UbitUmarov
439cbf0d4d
missed a few..
2018-01-09 19:48:13 +00:00
UbitUmarov
eec3921800
fall back to a obsolete property since several monos in use (include our own) do not suporte the proper .net4.0 one
2018-01-08 12:00:21 +00:00
UbitUmarov
89a690c11f
a few more xml things
2018-01-05 12:24:07 +00:00
UbitUmarov
ec6f87d3ef
disable some XmlResolver
2018-01-04 23:51:43 +00:00
UbitUmarov
59de8fbba0
fix placement of xml ReadEndElement()
2017-07-16 06:10:24 +01:00
UbitUmarov
9ae26fc5af
store kfm on inventory. this may still be a bit confusing on rez
2017-07-16 05:19:27 +01:00
UbitUmarov
bd249bdf5b
replace the wrong libOMV user modifiable Utils.EnUSCulture by our own no User modifiable Culture.FormatProvider, and also for internal coerence. We do use the libomv on other code paths, so that must be fixed
2017-07-13 04:14:33 +01:00
UbitUmarov
51d32e3bed
add more missing en-us culture on scene serializer writes
2017-07-13 02:57:57 +01:00
UbitUmarov
d12957dc2c
still losing time with of halcyon incompatibile oars... cathch exceptions of the function that actually throws; Reduce log spam; don't let a broken MOAP stop all object deserialization. Fixing MOAP does not mean halcyon oars issues are fixed, just one. And really we should not even try to go against halcyon decison to be incompatible.(our MOAP encoding did not change since 2010)
2017-06-09 12:14:13 +01:00
Robert Adams
5bfe8b18fe
Another attempt at parsing MOAP <Media> elements in OAR files.
...
Seems there are multiple interpretations of the format of the content of the
<Media> element in OAR files. OpenSimulator (for reasons lost in the mist of time)
escapes the XML in the element and then reparses it was a separate XmlReader.
Other simulators fill the <Media> element with regular XML.
This patch parses the <Media> escaped XML content as it always has and, if
the parsing fails, falls back to trying to parse the pure XML.
2017-06-08 21:41:34 -07:00
UbitUmarov
29f2421d4f
revert fa5bf4fd0b for test
2017-06-08 11:45:33 +01:00
Robert Adams
fa5bf4fd0b
Correct parsing of 'Media' XML element in PrimitiveBaseShape when reading an OAR file.
...
The code used to call Serializer.ReadElementContentAsString() and then expected to
pass the XML to PrimitiveBaseShape.FromXml to parse. This would throw as
ReadElementContentAsString does not allow any children of the element.
Reading with Serializer.ReadInnerXml() was the fix.
This was only not a problem because most often shapes don't have media and
most simulators don't output anything if the media array is empty.
2017-06-04 20:51:56 -07:00
UbitUmarov
3a8dd24fd1
move deep effective permissions aggregation to first time use and not on changes. There flag it is need with InvalidateDeepEffectivePerms(). Add config options PropagateGroupShareOutwards and PropagateAnyOneOutwards
2017-05-04 11:37:13 +01:00
UbitUmarov
443fc60cdf
store the physics inertia override in Mysql and add it to serializer. run prebuild is required
2017-04-01 17:49:17 +01:00
UbitUmarov
db2fbf6516
add more calls to effective permissions aggregation, some paths may still be missing on objects changes, but remove the aggregation on check paths, so all can be tested.
2017-01-17 13:24:09 +00:00
Melanie Thielker
b16abc8166
Massive tab and trailing space cleanup
2017-01-05 19:07:37 +00:00
Mandarinka Tasty
7c566dca5a
The new Constant: integer OBJECT_REZZER_KEY = 32;
...
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com >
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt >
2016-12-04 17:18:56 +00:00
Diva Canto
0b32cf0e8f
Can't do it do it this low in the stack. Attachments on teleports apparently rely on
...
State being != 0.
Revert "Mantis #7932 : Some objects were being serialized with PCode=9 and State != 0 (meaning attachments). That should never happen."
This reverts commit f19199cf4a .
2016-06-22 06:21:23 -07:00
Diva Canto
f19199cf4a
Mantis #7932 : Some objects were being serialized with PCode=9 and State != 0 (meaning attachments). That should never happen.
2016-06-21 20:28:25 -07:00
UbitUmarov
d8528a7ba0
add axis locks to sop serializer. Now they are also saved to inventory
2015-10-20 18:37:24 +01:00
UbitUmarov
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
UbitUmarov
3829df1059
try to implement core load oar options
2015-08-24 17:05:16 +01:00
Oren Hurvitz
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
Diva Canto
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
Diva Canto
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
UbitUmarov
a6ffcbb7f9
always write physicsShapeType on sop serialization since default value
...
can't be guessed in some cases
2014-11-03 00:56:48 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
UbitUmarov
5a7a609683
remove forgotten lines
2014-07-27 08:11:27 +01:00
UbitUmarov
eb55e69d4a
serialize sound parameters for llLoopSound
2014-07-27 08:08:01 +01:00
Oren Hurvitz
33cc847c4a
When saving an OAR in "Publish" mode, also discard Group information
2014-05-26 15:33:13 +01:00
Oren Hurvitz
1fe504fee5
Better skipping of "SculptData" when parsing XML
2014-03-28 12:52:06 +03:00
Oren Hurvitz
f360b687d6
Removed "SculptData" from the serialized XML format of prims
2014-03-28 07:51:21 +01:00
Oren Hurvitz
5fd9411143
Refactored Load IAR: created a generic mechanism to modify the SOG's as they are being loaded
...
Resolves http://opensimulator.org/mantis/view.php?id=6942
2014-03-24 18:17:35 +01:00
Oren Hurvitz
89945f8829
Refactored: ExternalRepresentationUtils should be the only place where the "CreatorData" field is calculated, to ensure uniformity
...
Resolves http://opensimulator.org/mantis/view.php?id=6933
2014-03-24 18:00:59 +01:00
Melanie
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
7cab41f422
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
...
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
Melanie
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
Aleric Inglewood
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
(cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
2013-09-22 21:10:01 -05:00
Melanie
ffcee82b1d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2013-06-30 18:27:30 +01:00