Commit Graph

58 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
189c67db95 On object deserialization, go back to logging errors at DEBUG level rather than ERROR. Restore extra log message if shape processing fails.
Logging level was DEBUG before 312e145 (Fri Feb 3 2012).
312e145 also accidentally removed the 'general error' log message if any shape deserialization failed.
This commit restores it, though this has no functional impact.
2012-02-13 20:43:26 +00:00
Justin Clark-Casey (justincc)
6c252a0fa1 Add TestRegionSettingsDeserialize 2012-02-04 00:55:03 +00:00
Justin Clark-Casey (justincc)
2b6c5fcb31 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-02-03 23:48:12 +00:00
Justin Clark-Casey (justincc)
312e1457dd Change SceneObjectSerializer to use common ExternalRepresentationUtils.ExecuteReadProcessors() methods.
Adds ability to submit a customized exception message to match logging.
2012-02-03 23:47:01 +00:00
Snoopy Pfeffer
bd9d7484f0 Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim 2012-02-04 00:39:58 +01:00
Snoopy Pfeffer
83ef13a79a Changed save oar and save iar parameter -p|--profile to -h|--home, including corresponding RemoteAdmin parameter 2012-02-03 23:53:18 +01:00
Justin Clark-Casey (justincc)
6234264211 Refactor common deserialization processor code to generic method ExternalRepresentationUtils.ExecuteReadProcessors() 2012-02-03 22:45:50 +00:00
Justin Clark-Casey (justincc)
f17066b7bf Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order.
This brings it into line with other deserializations such as object and will improve future backward compatibility.
2012-02-03 22:21:54 +00:00
Melanie
574c240202 Fix test failure 2012-02-03 00:05:36 +00:00
Melanie
447a66d660 Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
Diva Canto
8bdd80abfa HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI. 2012-01-12 09:56:35 -08:00
Oren Hurvitz
804fe2d9b0 Save the sun's position in OARs 2011-06-10 20:55:58 +01:00
Justin Clark-Casey (justincc)
0e465da187 remove now unused individual LandData prim counts.
However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc.
This is probably why prim counts were being done there in the first place.
2011-04-05 21:25:54 +01:00
Justin Clark-Casey (justincc)
8a2360bf81 Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests 2011-03-09 01:21:31 +00:00
Diva Canto
8fdc810a23 Addresses mantis #5360: CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information. 2011-02-03 04:07:36 -08:00
Diva Canto
7d24dbca3c Added some comments. Better than listening to the boring speaker... 2010-12-01 16:01:22 -08:00
Diva Canto
49b59fffee Fix unit test. 2010-11-29 09:57:41 -08:00
Diva Canto
f86c438653 Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. 2010-11-29 08:43:33 -08:00
Diva Canto
ca8d015733 Changed the parser for InventoryItem deserialization. Moved some utility functions around. 2010-11-27 11:40:54 -08:00
Justin Clark-Casey (justincc)
1064e743be Allow OARs and IARs to save and load meshes.
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem.  Needs more investigation.
2010-10-22 21:12:22 +01:00
Jeff Ames
f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
Melanie Thielker
6a0a878f7c Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
2010-09-05 14:28:33 +01:00
Justin Clark-Casey (justincc)
5925aac859 Add --merge switch to load iar.
When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
2010-06-30 00:10:44 +01:00
Justin Clark-Casey (justincc)
721c1085da make oar object filename/pathname creation a helper method
reused in both tests and oar code
reduction in checking is outweighed by greater test clarity
2010-05-21 20:43:11 +01:00
Justin Clark-Casey (justincc)
74ef1ed36f add prim item and test asset save in save oar unit test 2010-05-21 19:36:39 +01:00
Teravus Ovares (Dan Olivares)
4183cef409 * Fixes LandDataSerializerTests on Windows by stripping CR from the serialization result since the reference serialization has LF only.
* Added a bool result and then an Assert.That(result) because resharper was having a hard time with the equality compare in Assert.That.
2010-05-05 21:22:29 -04:00
Justin Clark-Casey (justincc)
2bf1761ad8 When saving an oar/iar, don't attempt to write out the data byte array if it's empty
On Mono 2.6 (and probably before) this causes a non-obvious IOException
2010-03-31 19:51:17 +01:00
Melanie
c033223c63 Merge branch 'master' into presence-refactor 2010-02-15 00:20:48 +00:00
Justin Clark-Casey (justincc)
00800c59d3 Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
Diva Canto
68b7307f4f Forgot to remove 'using' 2010-01-10 16:34:01 -08:00
Diva Canto
53e83e5dbb * Starting to clean the house...
* Fixed circular dependency
2010-01-10 16:20:59 -08:00
Diva Canto
1e1b2ab221 * OMG! All but one references to UserProfileCacheService have been rerouted!
* HG is seriously broken here
* Compiles. Untested.
2010-01-10 10:40:07 -08:00
Jeff Ames
0a259caeef Minor formatting cleanup. 2009-10-19 15:48:07 +09:00
dr scofield (aka dirk husemann)
2107b67f1b - cleaning up LandData/ILandObject capitalization issues
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02:00
dr scofield (aka dirk husemann)
133a4a9906 - adding new LandDataSerializer testcase to "test-xml" target as well
- adding another LandDataSerializer testcase
2009-10-01 15:03:16 +02:00
dr scofield (aka dirk husemann)
05da73c300 fixing LandDataSerializer (yeah! for testcases) 2009-10-01 12:01:41 +02:00
dr scofield (aka dirk husemann)
18416ec518 Merge branch 'oar-parcel' into x-opensim 2009-10-01 10:30:43 +02:00
dr scofield (aka dirk husemann)
77ed8e977a adding meat to the LandDataSerializerTest cases. 2009-10-01 10:30:26 +02:00
dr scofield (aka dirk husemann)
5b378a793b Merge branch 'oar-parcel' into x-opensim 2009-10-01 09:48:30 +02:00
dr scofield (aka dirk husemann)
40cf840df2 adding testcase for LandDataSerializer; fixing LandDataSerializer ;-) 2009-10-01 09:47:45 +02:00
Jeff Ames
606e831ff5 Formatting cleanup. 2009-10-01 09:38:36 +09:00
Jeff Ames
ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
dr scofield (aka dirk husemann)
33515c75e4 adding LandDataSerializer (not connected anywhere, work-in-progress)
[hi, there, justin!]
2009-09-30 16:19:39 +02:00
Charles Krinke
acf7206f4b Thank you kindly, dslake, for a patch that:
The region dearchive module assumes extra null bytes will be appended 
to the end of every OAR file. This may be due to the block nature of 
storage but it seems like an unsafe assumption. When streaming region 
archives over a network or through a memory stream, no additional null 
bytes are added to the end and this an exception.
2009-08-02 19:30:25 +00:00
Jeff Ames
840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00
Dr Scofield
9e37e291b0 making TarArchiveReader more resilient when faced with OARs created by
ancient tars.
2009-05-27 17:34:06 +00:00
Justin Clarke Casey
6277156044 * When saving an oar, save assets when immediately received rather than storing them all up in memory
* Hopefully this will remove out of memory problems when saving large oars on machines without much memory
* It may also speed up saving of large oars
2009-05-14 20:37:54 +00:00
Justin Clarke Casey
aaad2fc8ff * minor: use system ascii encoding rather than newing up our own object 2009-05-07 19:27:38 +00:00
Justin Clarke Casey
35c7aae455 * correct spelling mistake in item seiralization 2009-04-24 15:56:41 +00:00
Justin Clarke Casey
170cea5088 * minor: make inventory item deserialization code easier to read 2009-04-24 15:44:22 +00:00