aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-252-0/+157
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-242-0/+157
| | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
* | Merge branch 'master' into careminsterMelanie2012-11-151-1/+1
|\ \ | |/
| * Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-131-1/+1
| | | | | | | | have an AssemblyInfo file.
* | Merge branch 'master' into careminsterMelanie2012-10-121-0/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Disambiguate use of RegionFlags in NullRegionDataJustin Clark-Casey (justincc)2012-10-091-0/+1
| | | | | | | | | | This was not necessary with the nant build but is for xbuild, since xbuild includes associated project DLLs And so picks up OpenMetaverse.dll even though it isn't referenced by OpenSim.Data.Null.dll
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+13
| |
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+13
| |
* | Merge branch 'avination' into careminsterMelanie2012-06-111-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-071-0/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-271-2/+20
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Environment Module - allows Environment settings for Viewer3 warning: ↵PixelTomsen2012-05-231-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | includes database region store migrations for mssql, mysql, sqlite enable/disable this module: Cap_EnvironmentSettings = "localhost" (for enable) Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file) or owerwrite in OpenSim.ini mantis: http://opensimulator.org/mantis/view.php?id=5860 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Format cleanupBlueWall2012-05-231-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-03-312-19/+56
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Lock NullFriendsData.m_Data for consistency and against concurrent read/writeJustin Clark-Casey (justincc)2012-03-301-30/+39
| |
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵Justin Clark-Casey (justincc)2012-03-302-2/+30
| | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc.
* | Merge branch 'master' into bigmergeMelanie2011-12-051-9/+31
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-031-9/+31
| | | | | | | | | | This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate. Normal standalone operation unaffected.
* | Merge branch 'master' into bigmergeMelanie2011-11-141-1/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-141-1/+9
| |
* | Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmergeMelanie2011-10-111-2/+4
|\ \ | |/
| * Null simulation data must return a non-null region settings or other parts ↵Dan Lake2011-09-201-2/+4
| | | | | | | | of the simulator expect
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-111-0/+5
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-161-0/+5
| | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
* | Bring us up to date.Tom2011-09-141-0/+4
|\ \ | |/
| * Fix unit tests from RegionSettings commitJustin Clark-Casey (justincc)2011-09-091-0/+4
| |
* | Resolve merge commits, stage 1Tom2011-09-041-2/+2
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-311-1/+1
| |
| * minor: a little bit of log message correction/commenting outJustin Clark-Casey (justincc)2011-08-111-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-4/+14
|\ \ | |/
| * More on HG Friends. Added Delete(string, string) across the board. Added ↵Diva Canto2011-05-221-1/+6
| | | | | | | | 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.
| * Fixed permissions bug related to friends in PermissionsModule. Added ↵Diva Canto2011-05-211-1/+6
| | | | | | | | FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work.
| * HG Friends working to some extent: friendships offered and accepted ↵Diva Canto2011-05-191-2/+2
| | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-3/+3
|\ \ | |/
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-04-121-3/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-062-0/+150
|\ \ | |/
| * * Bugfix - Compile NullEstateData implement public List<int> ↵Teravus Ovares (Dan Olivares)2011-04-041-0/+10
| | | | | | | | IEstateDataStore.GetEstatesByOwner(UUID)
| * Updates NullStorage plugin.Mic Bowman2011-04-042-0/+140
| | | | | | | | Thanks MisterBlue...
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-101-14/+51
|\ \ | |/
| * Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make ↵Justin Clark-Casey (justincc)2011-03-091-14/+51
| | | | | | | | static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-241-10/+38
|\ \ | |/
| * GetRegion(s)ByName with SQLite behaves like it does with other databases.Marck2011-02-221-10/+38
| | | | | | | | The in-memory storage of region data that is used by default with SQLite now handles wildcards in region names in the same way as SQL queries do with other databases.
* | Add the ability for gods to impersonate users. For this, bit 6 needs to beMelanie2010-11-251-0/+5
|/ | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password.
* Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-031-0/+3
| | | | from a region and allow normal day cycles to be reestablished
* Add copyright headers.Jeff Ames2010-09-121-1/+28
|
* Changed all string references of "IRegionDataStore" to "ISimulationDataStore"John Hurliman2010-09-111-1/+0
|
* Fixed the naming mess around data connectors for simulation dataJohn Hurliman2010-09-111-1/+1
|
* Add distance sort for null, tooMelanie2010-08-081-2/+5
|
* White space from previous commit.Diva Canto2010-07-311-29/+29
|
* Implemented console command "show hyperlinks".Marck2010-07-311-31/+30
|
generated by cgit v1.1 at 2024-10-27 21:15:36 +0000