Melanie c0f70d17fc Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs		2012-03-14 11:33:51 +00:00
..
MSSQL	Merge branch 'master' into careminster	2012-03-06 00:29:25 +00:00
MySQL	Merge branch 'master' into careminster	2012-03-14 11:33:51 +00:00
Null	Merge branch 'master' into bigmerge	2011-12-05 17:10:51 +00:00
Properties	…
Resources	…
SQLite	Merge branch 'master' into careminster	2012-03-03 09:58:57 +00:00
Tests	refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInventoryItem() to accept an agent id rather than a full IClientAPI.	2012-01-26 00:10:37 +00:00
AssetDataBase.cs	…
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	…
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	…
IInventoryData.cs	First pass at cleaning up thread safety in EntityManager and SceneGraph	2010-09-10 12:04:12 -07:00
IPresenceData.cs	…
IRegionData.cs	Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages	2011-11-19 01:16:07 +00: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
IniConfig.cs	…
Migration.cs	Formatting cleanup.	2010-10-04 21:28:17 -04:00