Commit Graph

811 Commits (300f4c58a646daa233a370e46f257bf65453aea8)

Author SHA1 Message Date
John Hurliman a3a8691ebe MySQLLegacyRegionData: Extreme Spam Edition(tm) 2009-10-06 14:18:37 -07:00
John Hurliman fa6027aa09 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle 2009-10-06 12:15:24 -07:00
Melanie 8a7a947faa Remove the using() constructs from the new style database modules; they caused
the underlying connection of a reader or command to be closed before the
reader or command itself. Added the proper logic to Close and dispose items
in CloseDBConnection. Readers and Connections need Close(), Commands need
Dispose(), in the order Reader, Command, Connection.
Also reinstated 80-column-friendly formatting
2009-10-06 14:30:25 +01:00
John Hurliman e7c877407f * Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet
* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line
2009-10-06 02:38:00 -07:00
John Hurliman 6720369376 Added CloseDBConnection() to replace the old CloseReaderCommand(). This will close the MySQLConnection attached to a MySQLCommand. I'm not sure if this accounts for every time a database connection needs to be closed, but it matches up 1:1 with the places where the database connection was previously being closed 2009-10-05 16:39:40 -07:00
Melanie 5702c8f910 Adapt to renamed members in landObject 2009-10-05 16:31:54 +01:00
unknown 7c3e5afc0c MSSQL changes for Grid server in ROBUST plus some code tweaks 'n tidy up 2009-10-05 16:08:35 +01:00
John Hurliman 29a4614529 * MySQL data tests now pass by fixing a bad fix for a bad cast on the asset Local member in MySQLAssetData
* First pass at applying the using(){} pattern to IDisposable objects. Always use the using pattern on IDisposable objects whenever possible, do not manually call .Close() or .Dispose() unless there is no other way to write the code. This pass mostly covers OpenSim.Data.MySQL, and should have no functional change (tests still pass)
2009-10-04 13:57:51 -07:00
Melanie 6878b26b0d Merge branch 'diva-textures-osgrid' 2009-10-04 05:49:16 +01:00
John Hurliman 387e9f7a7f * Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
dr scofield (aka dirk husemann) 75a42e0459 reducing region DB log spam 2009-10-02 12:05:59 +02: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
Diva Canto c8c4b4c505 Switched log level of an annoying message in SQLite to Debug, and commented it too. 2009-10-01 16:39:41 -07: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
Jeff Ames f00126dc2d Add copyright header. Formatting cleanup. 2009-09-29 08:32:59 +09:00
Melanie 42746e99bd Make the RegionData plugin store the RegionName 2009-09-27 23:02:40 +01:00
Melanie 12640d0824 Prevent manually setting Data["locX"] and Data["locY"], since that would
overwrite the posX and posY members of the structure
2009-09-27 21:58:34 +01:00
Melanie b5bf3f87d5 Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
	OpenSim/Data/MySQL/MySQLRegionData.cs
2009-09-27 21:25:10 +01:00
Melanie 8e091f5903 Add the Migration for the regions table 2009-09-27 21:17:23 +01:00
Justin Clark-Casey (justincc) 2995d87d75 minor: remove some mono compiler warnings 2009-09-25 19:29:40 +01:00
Diva Canto 6a5d7650d0 All tests pass for MySQL/MySQLRegionData.
Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient.
2009-09-24 18:23:55 -07:00
Diva Canto 1faaa0a43a GridServerPostHandler finished. GridClient tests all work. More guards on getting parameters and replies over the wire. 2009-09-24 15:30:00 -07:00
Diva Canto 1260c81a9c More tests. Seems to be working.
Grid connector modules are enabled for standalones only, but nothing in the simulator uses them yet, so it's safe to go in.
2009-09-23 20:51:04 -07:00
Diva Canto 67276589c8 Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
Added grid configs to standalones.
2009-09-23 17:20:07 -07:00
Diva Canto 4a55ff88c0 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-18 19:17:02 -07:00
Diva Canto e736273815 First pass at the grid service. 2009-09-18 19:16:30 -07:00
John Hurliman f42d085ab1 SceneObjectGroup cleanup. Removes the default constructor and unnecessary null checks on m_rootPart 2009-09-16 15:06:08 -07:00
Melanie df7904c58b Add the Null storage implementation for the RegionData service. Standalones
have no regions table, so this is needed
2009-09-16 18:20:08 +01:00
Melanie a251864e64 Add the migration for scoping grid data 2009-09-16 17:56:24 +01:00
Melanie 90a4d4f9f9 Adding the MySQL RegionData service. 2009-09-16 17:52:16 +01:00
Melanie 8622f205d7 Database interface tot the new region store 2009-09-16 17:05:35 +01:00
Justin Clark-Casey (justincc) b061f2a3b0 oops, disable T012_EstateSettingsRandomStorage() again since it does appear to fail occasionally 2009-09-07 18:39:23 +01:00
Justin Clark-Casey (justincc) 116933bee5 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2009-09-07 18:26:53 +01:00
Melanie a6e2e94345 Thank you, StrawberryFride, for a hit-and-run patch to add authentication
and user services to MSSQL
2009-09-06 23:05:06 +01:00
Justin Clark-Casey (justincc) fc8efc1667 T012_EstateSettingsRandomStorage() which wasn't being run because the method was private
test appears to work, so method made public to run in tests
2009-09-06 22:09:19 +01:00
Melanie 2a8f66b221 Revising the user account data interfaces. No user functionality yet 2009-09-06 04:28:42 +01:00
Melanie 67f803c919 Add the new AuthStore to migrations. Update OpenSim.Server.ini 2009-09-04 08:10:05 +01:00
Melanie ac40c7a74c Fully implement unencrypted auth token operations 2009-09-04 07:48:09 +01:00
Melanie c9a24ece54 More work on new authentication service 2009-09-04 03:13:32 +01:00
Melanie 90262d4092 Add the user authentication data adapter. This is meant to use a new table
schema, but can read the old ones for compatibility. It should not be used
to write to the old tables unless you know what you're doing!
This is untested and will probably not work.
2009-09-04 00:23:26 +01:00
Chris Hart c4ae9413f1 MSSQL Minor tweak to recent patch for region loading (Thanks Grumly57 for spotting it!) 2009-09-03 19:07:50 +01:00
Chris Hart 4841858600 MSSQL patch to mirror mantis 4077 for MySQL to improve region load times 2009-09-02 19:42:18 +01:00
Melanie f32de6fe88 Thank you, dslake, for a set of patches to improve OpenSim startup
and idle performance.
2009-09-02 03:33:31 +01:00
Arthur Valadares 604ef5ba79 Fix issue where conversion of temporary boolean variable fails on MySQL 2009-08-21 17:48:45 -03:00
Diva Canto a3db2936f7 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-08-19 17:36:34 -07:00
Diva Canto 6e35ddb0e9 Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in SQlite. Fixes most grief in
http://opensimulator.org/mantis/view.php?id=4035
http://opensimulator.org/mantis/view.php?id=4027
2009-08-19 17:35:42 -07:00
Kunnis b1853d9f26 Fixing a spot I missed in assets. Switching Grid to the new naming schema with Store/Get 2009-08-19 23:46:25 +01:00
Kunnis f1287cc7af * Switching IAssetData to follow the new naming schema, removing the separate insert and update methods. 2009-08-19 23:45:22 +01:00
Jeff Ames 82c888fc6c Add copyright headers. Formatting cleanup. Fix a compiler warning. 2009-08-17 10:29:06 +09:00
Kunnis dd78c250ae * Added Expression based ignores to the PropertyScrambler, which makes a lot of the tests clearer because I'm not constantly resetting properties. 2009-08-16 14:34:16 -04:00
Kunnis 5dde4a4cfa * More improvements to BasicAssetTest.cs 2009-08-16 14:26:43 -04:00
Kunnis d2e5380cb2 * Fixed MySQL/MySQLAssetData.cs to properly do updates * Removed an extra parameter from MySQL/MySQLInventoryData.cs * Fixed a bug in SQLite/SQLiteAssetData.cs that was causing a NRE when updating an asset. * Improved the BasicAssetTest.cs to do full create/update/get testing * Improved the BasicInventoryTest.cs to do full create/update/get of both a folder and an item * Moved the null ref tests to the start of the PropertyCompareConstraint.cs, so that it doesn't throw when passing in a null item 2009-08-16 14:17:29 -04:00
Kunnis f6251ce810 * Modified SQLite/SQLiteInventoryStore.cs to not throw if the inventory row does not exist, to match the mysql behavior. * Modified SQLite/SQLiteRegionData.cs to only persist temporary items following the same rules mysql uses. * Added another ignore to the inventory test that was missing. * Added a few more ignores to the RegionTest that the first version of my test were missing. * Added ignoring the root Folder ID, which is set by the inventory system. * Added several improvements to the PropertyCompareConstraint: Protection against infinite loops, added IComparable<T> (for UUID) and moved IComparable before the property matching. * Fixed a bug where I was saving the inside of the ignore expression instead of the outside of it. 2009-08-16 14:15:59 -04:00
Kunnis 23d478f2fa Adding in Reflection-based testing, to ensure that all properties are covered. 2009-08-16 13:35:44 -04:00
Jeff Ames 2b630470b0 Add copyright headers. Formatting cleanup. 2009-08-16 17:30:13 +09:00
Justin Clark-Casey (justincc) 31820b0026 minor formatting adjustments 2009-08-14 18:36:09 +01:00
Kunnis c18f7560d9 Adding in Reflection-based testing, to ensure that all properties are covered. 2009-08-14 18:15:25 +01:00
Jeff Ames bc6ec3b564 Formatting cleanup. 2009-08-09 00:43:13 +09:00
Teravus Ovares (Dan Olivares) c8a68fb3fb * Remove hard coded 256 limitations from various places. There's no more 256m limitation within the OpenSimulator framework, however, the LLClient ClientView does not support regions larger then 256 meters so, if you try and make your region larger by setting Constants.RegionSize = 512; in OpenSim.Framework.Constants.cs, the terrain will not display on clients using the LLUDP protocol 2009-08-07 18:40:56 -04:00
Sean Dague b0e6d0fc01 skip sqlite tests on z linux, as sqlite doesn't work right on the platform 2009-08-06 14:01:36 -04:00
Teravus Ovares 64bd9a3354 * Updates libOMV to version 0.7.0
* Uses mantis #3811 as a base (thanks jhuliman) with changes.
* E-mail regarding interface changes sent to the opensim-dev list 
* Archive: https://lists.berlios.de/pipermail/opensim-dev/2009-July/007219.html
2009-07-25 15:49:10 +00:00
Justin Clarke Casey 98687df56b * Apply http://opensimulator.org/mantis/view.php?id=3586
* Make MSSQL current in NHibernate
* Thanks mpallari
2009-07-24 20:39:46 +00:00
Justin Clarke Casey a54998e1f9 * minor: spacing adjustment to retrigger panda 2009-07-24 20:27:24 +00:00
Justin Clarke Casey c3bb9ec42c * Apply asset and inventory name and description bound checks to MySQL 2009-07-24 20:01:17 +00:00
Justin Clarke Casey f75949692e * Extend mssql name string size checking to create/update folder 2009-07-24 19:47:15 +00:00
Justin Clarke Casey 92047114ac * Extend inventory name and description length checks to UpdateItem for mssql 2009-07-24 19:41:53 +00:00
Justin Clarke Casey de893a4a10 * Correct minor bug where item description bounded string was not actually being used in the previous patches. 2009-07-24 19:35:16 +00:00
Justin Clarke Casey b67c1f5086 * Apply similar bounds checks on name and description fields on MSSQL UpdateAsset 2009-07-24 19:21:37 +00:00
Justin Clarke Casey a3f4330c87 * Apply http://opensimulator.org/mantis/view.php?id=3902
* Restrict asset and inventory name descriptions so as not to overflow MSSQL field lengths
* Thanks StrawberryFride
2009-07-24 19:10:32 +00:00
Teravus Ovares d54aac41d2 * Added a user friendly message to the sqlite regionsettings saver giving them troubleshooting options and telling them to restart the simulator. This situation, hopefully is temporary and generates an exception when sqlite users first start OpenSimulator because of an unexpected condition in the database layer. Restart and all is well.
* Added a user friendly message to the 'No IInventoryService available' condition with troubleshooting options.
2009-07-10 21:47:54 +00:00
Melanie Thielker 744196d9ba Thank you, StrawberryFride, for a patch to fix MSSQL parameter naming. 2009-07-09 15:14:43 +00:00
Sean Dague fe21189aa4 From: Chris Yeoh <yeohc@au1.ibm.com>
Ooops, sorry there was a bug in the patch and causes an exception
on some system (I think it only happens on windows since it didn't
occur during my testin). I've attached a one liner which fixes the problem.
2009-06-30 13:50:12 +00:00
Arthur Valadares dc9900d73f Thanks StrawberryFride, for a patch that fixes MSSQL migration:
Minor tweak to a region migration SQL script for the OAR DateTime field - SQL Server syntax slightly different from MySQL (and there is no unsigned in MSSQL, sadly)
2009-06-29 19:24:43 +00:00
Sean Dague 3dc2010da6 From: Chris Yeoh <yeohc@au1.ibm.com>
Attached is a patch that changes the oar file saving of creation date/time to an integer
instead of a string. I did this after justincc emailed me saying there is a problem
with internationalisation doing it the old way and I said I'd fix it. Its been
tested with MySQL and I've made the changes for MSSQL but that hasn't been well tested.
2009-06-29 15:05:12 +00:00
Jeff Ames 65d48a5e60 Formatting cleanup, ignore some generated files. 2009-06-22 11:04:09 +00:00
Sean Dague fa54ef5030 more type clean fixes for mono 2.4.2 2009-06-19 00:01:50 +00:00
Sean Dague 96f3001bfb mono 2.4.2 seems a little more type strict, fix some sqlite tests to pass 2009-06-18 23:59:21 +00:00
MW 2755f6b891 Applied patch from Mantis #3817, which fixes a error when using MSSQL. I don't use MSSQL so couldn't test this myself. But there was certainly duplicated instructions in these files...which this patch fixes. Thanks Grumly57 2009-06-18 20:18:47 +00:00
Melanie Thielker 3ee599b900 Add the missing resource files for MSSQL
Mantis #3800
2009-06-17 14:54:25 +00:00
Melanie Thielker 664dd58cd9 Fixes Mantis #3793 . Committing thomax/Snoopy's patch to allow deeding of objects, with changes:
- Set OwnerID = GroupID for deeded objects.
- Close a security loophole that would have allowed a user with deed rights in a group to deed ANY object to that group, even if it's not owned by them and/or not set to that group
- Set LastOwnerID correctly. Handle objects vs. prims correctly.
2009-06-14 21:44:34 +00:00
Charles Krinke 831264fc98 Thank you kindly, BlueWall, for a patch that solves:
SQLite error on creating user.
2009-06-10 17:53:06 +00:00
Jeff Ames a23d64dec1 Formatting cleanup. 2009-06-10 04:28:56 +00:00
Dr Scofield 717fd3b5b9 From: Chris Yeoh <yeohc@au1.ibm.com>
This patch adds oar file date and time (UTC) meta data to an oar file
when it is created.  It also adds a unique ID, though this id does not
in anyway identify the machine that the oar file was created on.

When an oar file with this meta data is loaded this extra information
is saved with the region settings and available via LSL through:

- osLoadedCreationDate()
- osLoadedCreationTime()
- osLoadedCreationID()

If there is no meta data these fields will be blank. Subsequent oar
file loads will erase the information for the previous oar file
load. Persistence has only been implemented for MySQL, the other
backends need updating.

Overall this allows us to much more easily identify the specific version of
software that clients are using. Its very straightforward to edit the oar file
to change the ID string to be something more human friendly.

Included in the patch is a new file OpenSim/Data/MySQL/Resources/030_RegionStore.sql
required for the MySQL DB migration.

btw I had a chat with justincc about this a few weeks ago since he
wrote the oar file import/export and he sounded happy to accept
something that included date/time information but didn't want anything
that would silently leak private information like machine names.
2009-06-03 12:48:04 +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
Charles Krinke 2d37ff6fb2 Thank you kindly, StrawberryFride for a patch that:
Added in some key code to read properties from MSSQL for user profiles 
which fixes issues of users having trouble editing estate settings on a 
grid where estate managers are not god, and fixes the option of enabling 
grid god functionality on MSSQL grids.

I have applied this to trunk only. I need someone else to examine and apply
to 0.6.5-Post-Fixes, or give me some direction, please.
2009-05-31 20:53:59 +00:00
Dr Scofield 901fdca13b From: Chris Yeoh <cyeoh@au1.ibm.com>
The attached patch implements llPassTouches. It has been added
to the export/import XML along with the flag for AllowedInventoryDrop.

The MySQL backend has been updated as well, though I haven't
done one of those before so could do with a check. I added
the migration mysql file as well.

The other data backends need updating as well.
2009-05-27 18:01:06 +00:00
lbsa71 ba360ede8b * Upped version number to 0.6.5 2009-05-25 11:43:56 +00:00
Dr Scofield c18c1f6c7c Revert "From: Chris Yeoh <cyeoh@au1.ibm.com>"
This reverts r9666. for some reason the mysql update does not work.
2009-05-25 11:32:31 +00:00
Dr Scofield 0bff818d39 From: Chris Yeoh <cyeoh@au1.ibm.com>
The attached patch implements llPassTouches. It has been added
to the export/import XML along with the flag for AllowedInventoryDrop.

The MySQL backend has been updated as well, though I haven't
done one of those before so could do with a check. I added
the migration mysql file as well.

The other data backends need updating as well.
2009-05-25 11:26:36 +00:00
Jeff Ames ecfad4944b Update svn properties. 2009-05-20 01:02:37 +00:00
Charles Krinke 7a8a481f88 Thank you kindly, StrawberryFride, for a patch that:
Adds maturity & access logic for MSSQL platform to 
mirror that of MySQL as committed in 9502.
2009-05-17 18:18:48 +00:00
Jeff Ames 5cfd84c924 Update svn properties. 2009-05-17 10:26:00 +00:00
Justin Clarke Casey 3791386d4d * Change default sqlite asset db back to Asset.db instead of AssetStorage.db
* This inconsistency has actually existed for some time but only the recent change brought it to light
* In the past, the default in ConfigurationLoader took precedence over the one in SQLiteAssetData
2009-05-15 18:50:38 +00:00
Charles Krinke c1d680b6c3 Thank you kindly, Patnad, for a patch that:
This is to handle the changes in the v1.23 viewer 
of LL regarding the adult rating. With this patch 
a region can be changed to the adult rating from 
LL viewer v1.23 and above.
2009-05-12 03:30:37 +00:00
Sean Dague 51a9c91909 WARNING: contains migration
Since creatorID is no longer treated as a UUID type in the code from the database we need to make sure that it isn't null in the database.  This updates all empty string and null values for this column to the Zero UUID, and makes the column a not null definition with a default fo the Zero UUID.
2009-05-08 14:16:07 +00:00
Sean Dague 3485b2b1c3 now that creatorID is no longer a strict UUID, and the column can still be NULL,
we lost protection from NULL strings.  This puts some protection in for that case.
This may address many of the inventory issues that are being seen intermitently.
2009-05-08 12:28:22 +00:00
Justin Clarke Casey 2284c8509f * Consistently used dashed uuid format for mysql region data, as is done for all other tables
* This revision contains a mysql data migration.  Please backup your mysql region database as a precaution before using this code.
* I also advise that you do a runprebuild[.sh|.bat] and a clean build ("nant clean build" if you're using the command line).
* This change is needed for future id schemes
2009-05-07 14:20:32 +00:00
Justin Clarke Casey e033f4028d * Consistently use dashed uuid format for sqlite region data, as was previously done for sqlite inventory data.
* This revision contains a data migration.  Please backup your sqlite region db as a precaution before using this code
* I also advise that you do a runprebuild[.sh|.bat] and a clean build ("nant clean build" if you're using the command line).
* This change is needed for future id schemes
2009-05-07 13:20:29 +00:00
Justin Clarke Casey c320dca2db * minor: remove some mono compiler warnings 2009-04-29 18:11:41 +00:00