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

Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2013-01-04 22:39:07 +00:00

..

MSSQL

Merge branch 'master' into careminster

2012-12-09 21:27:32 +00:00

MySQL

Merge branch 'avination' into careminster

2012-12-18 09:48:12 +00:00

Null

Merge branch 'master' into careminster

2013-01-04 22:39:07 +00:00

Properties

Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file.

2012-11-13 19:26:43 -08:00

Resources

Removed a few obsolete mono addin references. Mantis #4854

2010-07-14 14:47:01 -07:00

SQLite

Merge branch 'master' into careminster

2012-11-17 02:03:24 +00:00

Tests

Fix database service unit test failures by temporarily reverting BasicDataServiceTest extending OpenSimTestCase.

2012-11-26 22:25:36 +00:00

AssetDataBase.cs

Provide the interface for StoreAsset to report success or failure

2010-06-28 04:02:33 -07:00

DBGuids.cs

Formatting cleanup.

2010-09-12 13:43:49 -04:00

IAssetData.cs

Merge branch 'master' into careminster-presence-refactor

2010-09-13 16:17:38 +01:00

IAuthenticationData.cs

Fully implement unencrypted auth token operations

2009-09-04 07:48:09 +01:00

IAvatarData.cs

AvatarStore. Untested, but complete

2010-01-04 02:52:43 +00:00

IFriendsData.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

IGridUserData.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

IInventoryData.cs

First pass at cleaning up thread safety in EntityManager and SceneGraph

2010-09-10 12:04:12 -07:00

IniConfig.cs

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

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

IPresenceData.cs

Restrict IPresenceData.VerifyAgent

2012-12-09 15:08:32 -05:00

IRegionData.cs

Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.

2012-10-09 01:35:27 +01:00

IUserAccountData.cs

Add the ability for gods to impersonate users. For this, bit 6 needs to be

2010-11-25 20:34:55 +01:00

IXAssetDataPlugin.cs

Fix configuration problems where XAssetDatabasePlugin was picked up accidentally.

2012-03-19 00:18:04 +00:00

IXGroupData.cs

Fix bug where loading an OAR with a deeded parcel would always set the parcel owner ID to the estate owner even if the group UUID was present.

2012-11-24 02:43:31 +00:00

IXInventoryData.cs

minor: Adjust method doc on IXInventoryData MoveItem() and MoveFolder() to make it clear we're moving to an existing folder.

2012-11-09 01:18:11 +00:00

Migration.cs

Formatting cleanup.

2010-10-04 21:28:17 -04:00