Commit Graph

1747 Commits (8900d1139ec9ed7078703a81b042a5863a46b20e)

Author SHA1 Message Date
Roger Kirkman 54c1659934 AgentPreferences SQLLite Migration update Mantis #7157
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 22:10:51 -07:00
Cinder 7635138c59 SQLite and PGSQL adapters for AgentPreferences
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 14:53:17 -07:00
Cinder 0fa94f222d Refactor AgentPreferences so that database operations happen centrally. the opensim way.
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 07:27:42 -07:00
Cinder c1ddb7f05e Relicense AgentPreferences files to BSD and OpenSimulator
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 07:27:26 -07:00
Cinder 6f71d5c2c6 Support for Linden AgentPreferences capability and friends (UpdateAgentLanguage and UpdateAgentInformation) and Mantis #7157
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 07:27:01 -07:00
Diva Canto da32512ea4 Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*") 2015-04-29 18:47:17 -07:00
AliciaRaven 1e444b1449 Change UserProfiles so that the parcel name is used for a ProfilePick and not the parcel owners name. This change also fixes a bug where if the avatar enters and does not move, creating or editing a ProfilePick would set the parcelId as an empty UUID. This is because ScenePresence.currentParcelUUID is not set until the avatar moves.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-04-12 15:36:22 -04:00
Robert Adams 08c72a8dc1 varregion: remove use of Constants.RegionSize is various places.
More use of the Util routines for conversion of region handles into addresses.
2015-03-28 07:50:04 -07:00
Robert Adams bedafb8fae varregion: refactor use of 'double heightmap[,]' into references to new class TerrainData
and push the implementation from Scene into the database readers and writers.
2015-03-27 19:32:50 -07:00
BlueWall d7b45a3ed2 Alter the migrations so that it is a no-op as the columns are unused and the operation is very expensive 2015-03-04 19:27:34 -05:00
Cinder 9921c24c8f One more migration fix
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-04 13:47:15 -05:00
Cinder 56ae3da291 Chase latest change to asset description length with an update to XAssetStore db tables
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-04 13:47:15 -05:00
BlueWall 11a24d04b6 Revert "Chase latest change to asset description length with an update to XAssetStore db tables"
This reverts commit e520364f65.
2015-03-04 13:47:02 -05:00
Cinder e520364f65 Chase latest change to asset description length with an update to XAssetStore db tables
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-04 12:10:41 -05:00
Cinder e5c0b68849 Follow up to last commit, fix field length
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 22:50:12 -05:00
Justin Clark-Casey (justincc) 9363d4c784 Use ToString() on uuids returned in PGSQLUserProfilesData.GetUserImageAssets(). These are Guids rather than strings so casting to string generates a casting exception.
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-14 00:00:02 +00:00
Justin Clark-Casey (justincc) 02f2352ad5 Fix PGSQLUserProfilesData.GetUserPreferences error when no usersettings yet exist by inserting missing ID parameter.
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-13 23:52:52 +00:00
Justin Clark-Casey (justincc) 71d73777d9 Revert "Remove quotes from column selection in PGSQLUserProfilesData.UpdateAvatarProperties()"
This reverts commit fdecf4f610.
2015-01-13 21:53:28 +00:00
Justin Clark-Casey (justincc) 8f37a61912 Revert "Remove quotes from column selection in PGSQLUserProfilesData.UpdateAvatarInterests()"
This reverts commit f31feef6c1.
2015-01-13 21:53:18 +00:00
Justin Clark-Casey (justincc) 39989eda3b Revert "Remove quotes from column selection in PGSQLUserProfilesData.GetUserImageAssets()"
This reverts commit bd9539c2a7.
2015-01-13 21:53:04 +00:00
Justin Clark-Casey (justincc) 38f2b89248 Revert "Remove misstaken quotes from column selection in PGSQLUserProfilesData.GetUserAppData()"
This reverts commit 0794a40378.
2015-01-13 21:52:43 +00:00
Justin Clark-Casey (justincc) f9d2121bcf Revert "Remove quotes from column selection in PGSQLUserProfilesData.SetUserAppData()"
This reverts commit 59c0df962a.
This is necessary to preserve the casing of column names, otherwise pgsql converts everything to lowercase.
TIL, Unlike mysql, a quoted column still refers to the column itself...
2015-01-13 21:50:11 +00:00
Justin Clark-Casey (justincc) 24695dc05b Fix PGSQLUserProfilesData.UpdateUserPreferences() imviaemail and visible casts. These should be left as bools, not converted to strings.
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-13 21:40:49 +00:00
Justin Clark-Casey (justincc) 46e8a99526 Change PGSQLUserProfilesData.UpdateUserPreferences() to directly pass the UUID to the uuid parameter instead of its ToString()
This may well be the cause behind "operator does not exist: uuid = character varying" pgsql errors.
If so, the other instances will also be changed.
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-13 21:13:57 +00:00
Justin Clark-Casey (justincc) 492d49eb08 Fix MySQL and PGSQL *UserProfilesData.GetUserAppData() calls to correctly set the UserId parameter instead of the non-existing Id parameter when writing a record because none yet exists.
SQLite version is already correct for this.
2015-01-13 20:33:36 +00:00
Justin Clark-Casey (justincc) 59c0df962a Remove quotes from column selection in PGSQLUserProfilesData.SetUserAppData()
This may have been preventing it from working.
2015-01-13 20:27:37 +00:00
Justin Clark-Casey (justincc) 55ae9a7d10 Remove extraneous colon when setting TagId parameter in PGSQLUserProfilesData.GetUserAppData() 2015-01-13 20:15:37 +00:00
Justin Clark-Casey (justincc) 0794a40378 Remove misstaken quotes from column selection in PGSQLUserProfilesData.GetUserAppData() 2015-01-13 19:20:27 +00:00
Justin Clark-Casey (justincc) bd9539c2a7 Remove quotes from column selection in PGSQLUserProfilesData.GetUserImageAssets()
This may have been preventing it from working.
2015-01-13 18:57:32 +00:00
Justin Clark-Casey (justincc) f31feef6c1 Remove quotes from column selection in PGSQLUserProfilesData.UpdateAvatarInterests()
This may have been preventing it from working.
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-13 18:54:41 +00:00
Justin Clark-Casey (justincc) fdecf4f610 Remove quotes from column selection in PGSQLUserProfilesData.UpdateAvatarProperties()
This may have been preventing it from working.
2015-01-13 18:52:49 +00:00
Justin Clark-Casey (justincc) 0cc75a0a3c Remove quotes from column selection in PGSQLUserProfilesData.GetAvatarNotes()
This may have been preventing it from working.
2015-01-13 18:50:34 +00:00
Justin Clark-Casey (justincc) b38a552fd6 Remove quotes from field selection in PGSQLUserProfilesData.GetAvatarPicks()
This may have been preventing it from working.
2015-01-13 18:47:51 +00:00
Justin Clark-Casey (justincc) 43b094f549 minor: correct two exception messages in PGSQLUserProfilesData where I copy/pasted AgentInterestsUpdate twice 2015-01-13 18:42:04 +00:00
Justin Clark-Casey (justincc) 02dcfcf537 Remove the locking in PGSQLUserProfilesData which was buggy (Lock object wasn't set!) and is unnecessary.
Relates to http://opensimulator.org/mantis/view.php?id=7398
2015-01-12 23:39:27 +00:00
Justin Clark-Casey (justincc) 38590a4fad Get PGSQL UserProfilesData to log the exception trace for debugging rather than just the exception message. 2015-01-09 00:19:48 +00:00
Justin Clark-Casey (justincc) d9f7aa41c1 Remove unmaintained MSSQL support.
This has not been maintained for more than 2 years, is unimplemented for newer features (e.g. built-in groups) and has no core developers using it.
If somebody fixes these issues then it could be reinstated.
2014-11-28 00:27:13 +00:00
BlueWall a76aec8467 Fix whitespace hoping to avoid a flogging 2014-11-25 19:27:15 -05:00
BlueWall 41cc73233c Re-work handling of email notifications settings. 2014-11-24 11:00:47 -05:00
BlueWall 12108bf6e9 Fix handling of user preference updates where no email address is supplied 2014-11-23 14:25:48 -05:00
BlueWall b463870914 Add hypergrid teleporting support to user profiles picks 2014-10-27 17:27:42 -04:00
BlueWall 94250b6836 Fix some typecasting in PgSQL Groups adapter 2014-10-16 21:16:44 -04:00
BlueWall b7550c947b Experimental XAssets Module PgSQL Adapter: Remove unused migration. Syntax error preventing migration from running. 2014-10-16 12:34:04 -04:00
BlueWall 8a93d97320 Touchup PgSQL XAssets adapter 2014-10-15 17:28:51 -04:00
BlueWall b45c929d66 Fix over zealous chopping of text when editing (pilot error) 2014-10-15 09:55:41 -04:00
BlueWall 5c9ef4d083 Fix logging level to Error in exception handlers 2014-10-15 09:42:29 -04:00
BlueWall 231cdc2dc1 Cleanup unused code 2014-10-15 09:31:39 -04:00
BlueWall 1812cecdb7 Fix PgSQL adapter for UserProfiles 2014-10-15 09:08:25 -04:00
BlueWall a6f8f9d003 Get V2 Groups working under PgSQL. Needed to re-create tables to satisy the generic handler type matching. There should be no existing data because it couldn't complete the first migration as-is. 2014-10-12 13:48:39 -04:00
BlueWall 300e78bfd5 Make column names lower-case, change hash column type to bytea and remove old commented lines of code 2014-10-12 10:50:32 -04:00
BlueWall 7af878a4f4 Fix some errors in PgSQL XAssets by changing some data types. Also make sql query syntax more in line with the PgSQL AssetData implementation. 2014-10-10 19:58:07 -04:00
UbitUmarov e25849e1c4 remove redundant lock 2014-09-21 23:39:50 +01:00
Justin Clark-Casey (justincc) fabab7414f Remove database connection locking in MySQLXAssetData. This is unnecessary as connections aren't shared and transactions are already in place where necessary. 2014-08-22 20:34:33 +01:00
Justin Clark-Casey (justincc) 0cb805a64c Remove query locking in MySQLUserProfileData. This is not necessary as the connection is not shared. 2014-08-22 20:28:56 +01:00
Justin Clark-Casey (justincc) 709038aa2a Remove some use of database connection locking from MySQLSimulationData - this has not been necessary for some time as database connections are not shared.
However, many locks remain since they may effectively be providing transactionality in some operations (e.g. prim updates across multiple tables).
These are candidates for being replaced with proper database transactions, since this would not block unrelated operations (e.g. land save and object save)
or unrelated operations on the same tables (e.g. storage of one linkset whilst another is being removed).
In practice, any performance deg due to contention is probably rare and short lived as the major prim operations are performed in memory and only persisted some time afterwards.
2014-08-22 20:23:48 +01:00
Justin Clark-Casey (justincc) d899bdcb9b Remove lock in MySQLFramework. This is not necessary as the connection is not shared. 2014-08-22 19:52:03 +01:00
Justin Clark-Casey (justincc) f129b824c3 Removing locking on requests in MySQLAssetData.
These locks are not necessary since the connection is taken from the underlying mysql pool and not shared.
Such locking is already not done by some other parts of OpenSim.Data.MySQL.
Pointed out by arribasim-dev
2014-08-22 19:46:46 +01:00
Melanie Thielker 52dc27991f Give extra info on the call stack when SQL errors happen 2014-08-09 16:25:40 +02:00
Melanie Thielker ec5f96b272 Persist new land fields for access control 2014-07-29 05:53:40 +02:00
BlueWall 4a9282e681 Add missing parts to profiles - classified delete 2014-07-21 12:46:26 -04:00
Robert Adams aa8b44c001 Add code to GridService to check for overlapping of varregions
when registering a new region.

Adds parameter "[GridService]SuppressVarRegionOverlapCheckOnRegistration=false"
that can be turned on to suppress the error check if a simulator's database
has old regions that overlap.
2014-07-20 10:34:09 -07:00
Michael Cerquoni e455374a4b fix all instances of "non-existant" to "non-existent" (spelling mistakes) thanks Ai Austin for pointing this out. 2014-07-17 09:37:24 -04:00
Justin Clark-Casey (justincc) 5450b1b024 Change assembly versions to 0.8.1 2014-06-17 18:37:15 +01:00
Diva Canto eaf595c008 Fix a bug where estate not found would result in a dummy estate record with erroneous information.
Also, added conversion of EstateSettings from/to key-value pairs in preparation for robust net work connectors.
2014-05-31 11:40:54 -07:00
Diva Canto d6f9f690e5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-05-31 08:22:56 -07:00
Diva Canto 0eede1467f Moved these two estate-related interfaces to the projects where they belong. 2014-05-30 13:11:46 -07:00
Justin Clark-Casey (justincc) 27597463da Change Assembly verson of OpenSim.Data.PGSQL.dll to 0.8.0.* to match all other assembly versions 2014-05-27 23:40:29 +01:00
Justin Clark-Casey (justincc) 4a74c4533c minor: eliminate now unnecessary string.Format in postgresql RetrieveGroups method 2014-05-15 22:51:47 +01:00
Justin Clark-Casey (justincc) 6dc1b113d0 Escape find string in PgSQL core groups plugin 2014-05-15 22:45:01 +01:00
Justin Clark-Casey (justincc) d32d25634d Escape find string in MySQL core groups plugin 2014-05-15 22:09:37 +01:00
Oren Hurvitz d15a3b10a3 When sending JSON-RPC calls (for UserProfile), use WebUtil instead of constructing the HTTP requests manually. This allows the calls to be logged when using "debug http all 6". 2014-04-24 15:58:41 +01:00
Oren Hurvitz 998d7009a6 Eliminated many warnings 2014-04-23 16:37:36 +03:00
Oren Hurvitz 2c9859314f Changed table 'im_offline' to use UTF8 characters. This fixes a problem with Offline IM V2 (only relevant to MySQL).
This fixes http://opensimulator.org/mantis/view.php?id=7123

Users that use MySQL should change their MySQL configuration to support UTF8. In the config file /etc/my.cnf (Linux) or my.ini (Windows), add these settings:

   [mysqld]
   character-set-server=utf8

   [client]
   default-character-set=utf8

And then restart MySQL (on Linux: "sudo service mysqld restart").
2014-04-23 16:18:28 +03:00
Oren Hurvitz 93a9ed2a6d Changed the maximum asset name and description lengths to constants. Also, pre-truncate the description of dynamic textures. 2014-04-22 12:18:54 +03:00
Oren Hurvitz acc2c42a79 Better logging in PresenceService, to help diagnose presence problems. 2014-04-21 18:55:53 +03:00
Justin Clark-Casey (justincc) 530c86335d Fix the presence info caching used in llRequestAgentData(), which was completely inoperative.
This means the presence info may be out of date by up to 20 seconds, but this avoids scripts potentially triggering constants requests to user accout and presence info services.
Relates to http://opensimulator.org/mantis/view.php?id=7088 though I fixed in a different way.
Adds regression test for this case.
2014-04-11 00:29:06 +01:00
Oren Hurvitz 9211361b19 Fixed AssetsExist in SQLite 2014-04-02 10:00:09 +03:00
Oren Hurvitz 6b65895736 Made the SQLite unit tests work on Windows (sqlite3.dll wasn't being loaded) 2014-04-02 09:49:57 +03:00
Oren Hurvitz d1c3f8eef5 Added assets service method AssetsExist(), which returns whether the given list of assets exist.
This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
2014-04-02 06:30:57 +01:00
Justin Clark-Casey (justincc) 1247174db4 Fix MSSQLInventoryHandler.IncreementFolderVersion where sql accidentally used a MySQL style ?folderID insted of @folderID
Thanks to LuciusSirnah in http://opensimulator.org/mantis/view.php?id=7075 for this fix
2014-03-26 21:02:26 +00:00
Justin Clark-Casey (justincc) de941d2ec7 minor: remove compiler warning from NullEstateData 2014-03-26 21:00:57 +00:00
Justin Clark-Casey (justincc) 7a4c5b067d Add MSSQL EstateStore.migrations VERSION 10 transaction to add AllowLandMark, AllowParcelChanges and AllowSetHome columns to estate_settings table.
Taken from http://opensimulator.org/mantis/view.php?id=7074 by LuciusSirnah.  Thanks!
2014-03-26 20:42:53 +00:00
Justin Clark-Casey (justincc) 5e8dfb4f7e Fix extra physics params MSSQL migration (version 39).
This was failing because it used MySQL syntax
This is taken from Lucius Sirnah's entry in http://opensimulator.org/mantis/view.php?id=6593
But with the column existence checking removed, as this should not be necessary in a migration and is inconsistent with all other migrations, though I can see a case for doing it.
2014-03-26 20:34:04 +00:00
Oren Hurvitz 1b30ae81b5 Fixed updating usersettings in the database
Resolves http://opensimulator.org/mantis/view.php?id=6938
2014-03-24 18:02:05 +01:00
Oren Hurvitz b9e0d0fdb2 Don't show hidden groups in search results
Resolves http://opensimulator.org/mantis/view.php?id=6937
2014-03-24 18:01:56 +01:00
Justin Clark-Casey (justincc) ae56b946cf Fix a bug in previous commit 01520bb where I accidentally saved OtherCleanTime instead of Dwell 2014-03-18 00:34:40 +00:00
Justin Clark-Casey (justincc) 01520bbb3e Save and load dwell parcel stat in MySQL DB adaptor. Field in table already exists!
The SQLite database adaptor was loading and saving dwell whilst MySQL was not, even though the field already exists in the db table.
2014-03-18 00:02:55 +00:00
Justin Clark-Casey (justincc) 71918eeab4 Add regression test for sending group notices via xmlrpc groups connector. 2014-03-07 01:04:54 +00:00
Robert Adams e5d59dc696 Repair database routines so they properly return null when asked for
the heighmap of a region that does not exist.
2014-01-28 15:29:06 -08:00
Melanie c6e9db5866 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
Robert Adams f127e4b4ee Merge branch 'master' into varregion 2014-01-19 07:38:53 -08:00
Justin Clark-Casey (justincc) 1a8b56fa87 Merge branch 'justincc-master' 2014-01-16 00:33:04 +00:00
Oren Hurvitz 46c2791fe2 In the offline message table, store the sender.
This data is useful for preventing abuse (e.g., someone who sends too many messages), or for deleting message if their sender has been deleted.
2014-01-16 00:16:33 +00:00
Melanie 1eecb34e62 Remove the core module extra profile settings support carried in with the latest
patches. We don't need it.
2014-01-05 21:16:30 +00:00
Melanie e79fab91db Intermediate commit. Sill errors.
Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
Robert Adams 6937eec258 Merge branch 'master' into varregion
Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-17 06:18:13 -08:00
BlueWall 141d771a93 Fix issue with editing notes for other avatars 2013-12-16 17:36:21 -05:00
BlueWall b03ec6137f Populate user preferences with UserAccount email if it is present, else return an error indicating no email is on record for the user. 2013-12-16 17:36:04 -05:00
Robert Adams 13a9a4b653 varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
2013-12-14 07:53:01 -08:00
Melanie 958a8f274b Revert "Add support for user preferences (im via email)"
This reverts commit 1842388bb4.
2013-12-07 01:29:15 +00:00
Melanie ba48816fb6 Merge branch 'master' into careminster 2013-12-07 01:19:20 +00:00
Melanie 6d6b9ab791 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-07 01:08:49 +00:00
BlueWall 1842388bb4 Add support for user preferences (im via email) 2013-12-06 02:52:13 -05:00
Robert Adams 4eb52eb19e Merge branch 'master' into varregion 2013-12-05 21:07:44 -08:00
BlueWall 04f8fc1ce9 Adding profile partners fix to SQLite and PgSQL drivers 2013-12-05 20:25:28 -05:00
BlueWall 823a175f07 Stop writing partner id to record when updating profile data. This should be changed only by admin in backend. 2013-12-05 20:06:04 -05:00
Fernando Oliveira 9b76a46df0 Reversing back to the row["ColumnName"] case field name. http://opensimulator.org/mantis/view.php?id=6868 2013-12-06 00:41:02 +00:00
Robert Adams 31bacfbb63 Merge branch 'master' into varregion 2013-12-01 15:51:42 -08:00
Fernando Oliveira 0ad45531a1 Corrected case to get columns from Regions table from PostgreSQL http://opensimulator.org/mantis/view.php?id=6865
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2013-11-25 18:33:49 -05:00
Robert Adams 3193bcaae1 Merge branch 'master' into varregion 2013-11-24 07:23:12 -08: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
Fernando Oliveira f3f3d390f7 Fixed the update StoreRegionWindlightSettings() wasn't updating regionwindlight table, raising PrimaryKey violation;
Signed-off-by: Fernando Oliveira <fernando@oliveira.eti.br>
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2013-11-22 20:48:12 -05:00
Robert Adams beeec1c467 varregion: elimination of Constants.RegionSize from all over OpenSimulator.
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
2013-11-08 20:53:37 -08:00
Robert Adams ac94dc8a14 varregion: remove unused terrain serialization code in SQLite and PGSQL modules 2013-11-04 22:06:20 -08:00
Melanie 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
Robert Adams ff5885ab23 varregion: push TerrainData implementation up and down the database storage stack.
Implement both LoadTerrain and StoreTerrain for all DBs.
Move all database blob serialization/deserialization into TerrainData.
2013-11-01 11:35:31 -07:00
Robert Adams 2be0347f50 Merge branch 'master' into varregion 2013-10-28 09:30:26 -07:00
Fernando Oliveira 67ffb64764 Corrected estateID to EstateID on getEstates function at PGSQLEstateData.cs 2013-10-16 21:58:22 -05:00
Fernando Oliveira f83343d302 * One More thing, add an appdomain data element to ensure that we don't duplicate the assembly resolving. 2013-10-16 21:20:11 -05:00
Fernando Oliveira 8fdf70b87e * Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - Mono.Security.dll missing. The root of the issue is that the Postgres driver relies on Mono.Security.dll from the mono project. Unfortunately, when using Mono, including the dll in the distribution causes conflicts. This solution puts Mono.Security.dll in bin/lib/NET/ and, if windows .NET is the runtime, informs the assembly loader to load bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security namespace. On Mono, the included Mono.Security assembly is ignored. 2013-10-16 20:16:29 -05:00
Robert Adams c581506058 varregion: update PGSQL driver for storing variable terrain size blobs. 2013-10-16 08:13:06 -07:00
Robert Adams 8937a2244d Merge branch 'master' into varregion 2013-10-16 07:53:44 -07:00
fernando 3e1ca2bd21 * Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled)
* Please test
2013-10-15 11:55:08 -05:00
Fernando Oliveira ff8a768258 Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.
* Added PostGreSQL support
* Added MySQL/MySQLXGroupData.cs
* PostgreSQL data access implementation
* PostgreSQL dll binarie and RegionStore.migrations
* Migrations Scripts from MSSQL to POSTGRES
* Postgres SQL Type fixes
* Postgres SQL Connection string
* Data type issues
* more fixes
* tests and +tests
* UUID x string - FIGHT!
* Fixed PG types to internal csharp types
* More data type fix (PostgreSQL fields are case sensitive) :(
* more field case sensitive fixes
* changed the migration files to be case sensitive for fields.
* fixed fields case
* finished converting, now search for hidden bugs.
* some more fixes
* bool type fixed
* more case fixes;
* creatorID case fixed
* case fields fixed
* fixed default now() for TMStamp fields with don't allow nulls.
* fix case sensitve for Region name and Estate name
* fixed case for names for search
* fix class name Error
* Bug fixed on select and migrations
* Un-Reverting my change due to Postgres issue with the ILIKE function
* Fixed some issued for Diva Distro
* Fixes for integration with Diva Distro
* Added System.Core to prebuild.xml for PG project
* Configured to make DIff for Push to OpenSim Project
* Diffs only to PostgreSQL mods.
2013-10-12 16:33:45 -05:00
Robert Adams 86bf79aa2b Merge branch 'master' into varregion 2013-10-07 13:58:17 -07:00
Robert Adams 7416809077 varregion: plug in TerrainData class and modify TerrainModule and LLClientView to use same. This passes a terrain info class around rather than passing a one dimensional array thus allowing variable regions. Update the database storage for variable region sizes. This should be downward compatible (same format for 256x256 regions). 2013-10-07 13:57:40 -07:00
Melanie 69054ad134 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-10-06 18:32:20 +01:00
Justin Clark-Casey (justincc) 42bdf44658 Bump OPenSimulator version and assembly versions up to 0.8.0 Dev 2013-10-04 23:33:47 +01: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
Robert Adams aea5d3a842 Remove time based terrain storage in SQLite so revision number can be used
to denote terrain format revision.
Add terrain DB format revision codes to ISimulationDataStore.cs.
Setup so legacy compatible terrain storage and fetch is possible while
allowing future format extensions.
2013-09-28 07:33:55 -07:00
Robert Adams 317c04fe17 VarRegion: change RegionInfo storage of region coordinates from region
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
2013-09-28 07:33:52 -07: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 2f365ea80b Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2013-09-07 13:54:19 +01:00
Justin Clark-Casey (justincc) 4cbadc3c49 Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins.
This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators.
This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified
then existing configured defaults will still work.
Immediate use is for conference where we need to be able to specify different defaults
However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
2013-09-02 17:27:45 +01:00
Melanie bf283208df Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
Diva Canto 170a6f0563 This makes group search work (Groups V2). 2013-07-28 09:00:28 -07:00
Melanie a7eb1b5b85 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
Diva Canto c1705236c7 Fix HGTravelStore.migrations in SQLite (mantis #6709) 2013-07-19 20:25:33 -07:00
Dan Lake edef7472d1 Enable storing of environment settings in NullSimulationData 2013-07-18 13:33:50 -07:00
Melanie 7830cc9954 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
Diva Canto af02231a7b Added SQLite version of hg travel data store. UNTESTED. Hope it works! 2013-07-14 16:03:46 -07:00
Diva Canto b0140383da Cleanup old hg sessions (older than 2 days) 2013-07-14 15:47:54 -07:00
Diva Canto e33ac50388 HG UAS: Moved hg-session data from memory to DB storage. This makes it so that traveling info survives Robust resets. It should also eliminate the cause of empty IP addresses in agent circuit data that we saw in CC grid. MySQL only. 2013-07-14 14:31:20 -07:00
Robert Adams 65239b059f Enhance NullEstateData to remember stored estate values and return
them next time asked. This keeps any estate settings from being reset
when the estate dialog is opened in a region with null estate storage.
2013-07-11 20:55:32 -07:00
Melanie 5ddcc25ee9 Merge branch 'master' into careminster 2013-07-04 22:32:58 +01:00
Diva Canto 068a3afad9 HG Friends: migration #3 is failing on some installations of MySql. Setting the table to InnoDB seems to fix the problem. 2013-07-04 09:51:31 -07:00
Diva Canto 316e8f9239 Fix SQL statement 2013-07-02 16:10:09 -07:00
Diva Canto 9725b829d5 Do the same for SQLite and MSSQL 2013-07-02 15:48:30 -07:00
Diva Canto 2c05caec7f Really make it call the method with the query interface 2013-07-02 15:47:02 -07:00
Diva Canto e984bfb4c6 This should have a strong effect on the Unknown User issue mantis #6625 2013-07-02 14:31:39 -07: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
Justin Clark-Casey (justincc) dc0455e217 In XAssetService, on a delete asset request also delete the asset in any chained service.
This eliminates the async migration since it causes a race condition with the "delete asset" console command
2013-06-28 19:11:44 +01:00
Justin Clark-Casey (justincc) f7d09b898a Make the concept of namespaces explicit in dynamic attributes
This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc.
All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace.
This does alter the underlying dynattrs data structure.  All data in previous structures may not be available, though old structures should not cause errors.
This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release.
However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
2013-06-27 23:14:28 +01:00
Melanie 9975c5674c Merge branch 'master' into careminster 2013-06-13 02:49:43 +01:00
teravus 3357300362 * This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage. 2013-06-12 18:13:00 -05:00
Melanie 400f876d98 Merge branch 'master' into careminster 2013-06-11 21:01:58 +01:00
teravus d47a18fd09 * Adds KeyFrameMotion storage support to SQLite, just a note, seems that there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this.
* Has a prim table migration..     that might take a while, hold on to your hats.
* Fixes a null-ref when shutting down while keyframed motion is active.
2013-06-11 08:56:20 -05:00
Melanie a022ee5766 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-06-11 01:03:15 +01:00
BlueWall 1cb1245d84 SQLite support for UserProfiles 2013-06-07 20:14:39 -04:00
Melanie a3210d1cf8 Database persistence for keyframes. Contains a Migration. 2013-06-06 03:17:38 +01:00
Melanie 648e258b8e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
BlueWall d7fa9f671e Adding standard OpenSim header to source files 2013-05-31 22:03:27 -04:00
BlueWall bf03523323 Fill in fields with default values on profile creation 2013-05-31 10:40:47 -04:00
BlueWall 328883700a UserProfiles
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
2013-05-30 17:59:18 -04:00
Melanie 13cd8c17d7 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
2013-05-11 02:35:26 +01:00
Melanie 81d8deb1a8 Send up the part missing from the Avination Estate commit.
Warning - contains a small migration.
2013-05-11 01:27:37 +01:00
Melanie 7c729e1519 Merge branch 'master' into careminster 2013-04-29 00:38:20 +01:00
Diva Canto a517e597f5 Fix wrong sql statement in offline im. 2013-04-28 09:03:09 -07:00
Diva Canto 3bc8017464 Recover a lost "virtual". Downstream projects need this. 2013-04-25 09:23:15 -07:00
Melanie 7cf377fff0 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Data/MySQL/MySQLAssetData.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-04-10 13:20:55 +01:00
Justin Clark-Casey (justincc) e20b0d5695 minor: Make exceptions thrown by MySQLAssetData more consistent. 2013-04-10 00:03:37 +01:00
Melanie 41a652f6bd Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-04-02 23:47:19 +01:00
Justin Clark-Casey (justincc) 4153cfbf14 Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is either not syntactical or unnecessary.
May fix http://opensimulator.org/mantis/view.php?id=6593
2013-04-02 00:45:29 +01:00
Melanie b9146a7922 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-15 23:45:32 +00:00
Justin Clark-Casey (justincc) 35843e8ec8 Change the table and field names of XAssetService mysql db tables to be capitalized like Avatars, Friends, etc.
Also fixes access time being set on assets rather than XAssetsMeta
This is to try and be somewhat consistent with other service tables that are mainly in this style.
No migration is supplied, since nobody should be using this service yet except on a test basis.
2013-03-15 23:42:16 +00:00
Justin Clark-Casey (justincc) e9f3cd1a60 Implement access time updates on assets for XAssetService.
This only happens if access time is older than 30 days currently, in order to reduce database updates.
The idea is to give some idea of assets which haven't been accessed for a very, very long time.
These might conceivably be deleteable, though this will be a risk due to caching at other points in the chain.
This is actually currently much less useable on the xasset service since access time is on metadata rather than the data itself.
And many metadata entries may point to the same data.  Probably need to address this.
2013-03-15 23:17:54 +00:00
Melanie eb9458fd7e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs
2013-02-28 21:20:07 +00:00
Justin Clark-Casey (justincc) 9b045e72b6 Add asset name and description truncation warnings to SQLite database plugin for consistency. 2013-02-27 21:41:21 +00:00
Justin Clark-Casey (justincc) 74916ed777 Add more information to warnings logged when asset names and descriptions have to be truncated for database storage
On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are.
Even though they are never subsequently (inventory names/descriptions are always used instead).
2013-02-27 21:35:54 +00:00
Melanie 9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Diva Canto 4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Diva Canto 9380d01976 First commit of Diva Groups. The Data bits went to OpenSim.Data core, the rest to Addons.Groups.dll. 2013-02-19 07:26:40 -08:00
Diva Canto 46e182dbf5 Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that. 2013-02-19 06:37:20 -08:00
Diva Canto 8b1b8a3921 I need these for OfflineIM and Groups. 2013-02-18 12:08:05 -08:00
Melanie 069e587841 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
2013-02-10 00:17:14 +00:00
Oren Hurvitz 85b81ff7f2 Added physics parameters support to MSSQL and SQLite (not tested) 2013-02-09 01:03:58 +00:00
Melanie 6aa876a83b Rename Bounciness to Restitution 2013-02-07 03:40:48 +00:00
Melanie 6504e3d4ce Rename "Bounciness" to "Restitution" 2013-02-07 03:30:02 +00:00
Melanie 054a9928a0 Fix a bug I brought in by manually editing a diff file. Terrain is if cource not always at 20m. 2013-02-06 18:13:02 +00:00
Melanie e5beb480ea Partial port of Avination's support for the new physics parameters.
Implements the parameters as properties, the serialization and
database storage (MySQL only). Implements llSetPrimitiveParams for
prim physics shape and the other 4 extra params. Only the prim shape type
"None" is currently functional. No support for the Viewer UI (yet), that
will be ported in due course. Lots more to port, this is a large-ish changeset.
2013-02-06 08:03:04 +00:00
Melanie d3892bbd06 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-05 21:30:12 +00:00
Justin Clark-Casey (justincc) 1fc9f282fa Merge branch 'dynamic-attributes2' 2013-02-05 00:35:15 +00:00
Justin Clark-Casey (justincc) 1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
2013-02-05 00:23:17 +00:00
Justin Clark-Casey (justincc) 7a139f8e53 Remove the accidental PrimShapes column that I added back to the SQLite region store 2013-01-25 04:35:06 +00:00
Justin Clark-Casey (justincc) 7789415148 Fix tests by adding DynAttrs add column commands to RegionStore.migrations (these were originally in 021_RegionStore.sql which I might have forgotton to add 2 years ago). 2013-01-25 04:22:32 +00:00
Oren Hurvitz 86802bcf93 Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attributes 2013-01-25 04:03:24 +00:00
Oren Hurvitz fdec05a15e Stopped storing dynamic attributes in the PrimShape 2013-01-25 04:03:20 +00:00
Oren Hurvitz 918b062866 Added missing DynAttrs references in MySQL 2013-01-25 04:03:15 +00:00
Justin Clark-Casey (justincc) a6d9c26365 Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
2013-01-25 04:03:11 +00:00
Justin Clark-Casey (justincc) a3e1e6dd61 Implement dynamic attribute persistence on mysql and mssql
mssql is untested
2013-01-25 04:03:09 +00:00