Melanie 243acef917 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2011-11-03 00:06:14 +00:00

..

MSSQL

Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge

2011-10-11 22:23:40 +01:00

MySQL

Plug a security hole in the inventory service

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

Null

Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge

2011-10-11 22:26:18 +01:00

Properties

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

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

Resources

Removed a few obsolete mono addin references. Mantis #4854

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

SQLite

Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge

2011-10-11 22:23:40 +01:00

Tests

Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.

2011-11-02 14:59:00 -07: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

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

IRegionData.cs

Add some more fields to Estate settings and make them work.

2011-03-22 10:43:43 +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

IXInventoryData.cs

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

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

Migration.cs

Formatting cleanup.

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