Melanie ce5e900721 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-02-04 11:48:20 +00:00

..

Properties

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

Resources

Merge branch 'master' into careminster

2012-02-04 11:48:20 +00:00

MySQLAssetData.cs

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

MySQLAuthenticationData.cs

Pull up Assembly of the MySQL classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is just a refactor -- no functional changes whatsoever.

2011-03-08 09:02:29 -08:00

MySQLAvatarData.cs

remove further mono compiler warnings

2011-05-06 22:47:41 +01:00

MySQLEstateData.cs

Move Telehub tables and data from EstateSettings to RegionSettings.

2012-01-22 11:36:04 +00:00

MySQLFramework.cs

Updated MySQL connection management to use the MySQL connection pooling. This should accommodate various timeout problems that exist with the current connection pool code in a more general and standard way.

2010-02-05 18:07:59 -08:00

MySQLFriendsData.cs

More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.

2011-05-22 16:51:03 -07:00

MySQLGenericTableHandler.cs

Completely disable NPC being sensed as agents, the abuse potential is too great

2012-01-28 03:12:56 +01:00

MySQLGridUserData.cs

GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.

2010-05-07 21:29:56 -07:00

MySQLInventoryData.cs

Plug a security hole in the inventory service

2011-10-31 11:11:36 +00:00

MySQLMigrations.cs

Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"

2010-06-19 23:45:56 +01:00

MySQLPresenceData.cs

remove further mono compiler warnings

2011-05-06 22:47:41 +01:00

MySQLRegionData.cs

Pull up Assembly of the MySQL classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is just a refactor -- no functional changes whatsoever.

2011-03-08 09:02:29 -08:00

MySQLSimulationData.cs

Merge branch 'master' into careminster

2012-02-04 11:48:20 +00:00

MySQLUserAccountData.cs

Allow removing users from search and avatar picker

2011-07-31 17:04:22 +02:00

MySQLXInventoryData.cs

Allow item links to be deleted even when other deletes and purges are disabled.

2011-05-19 00:51:14 +01:00