aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-09-071-0/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-021-0/+5
| | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
* | Merge branch 'master' into careminsterMelanie2013-07-241-3/+17
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Enable storing of environment settings in NullSimulationDataDan Lake2013-07-181-3/+17
| |
* | Merge branch 'master' into careminsterMelanie2013-07-181-7/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * Enhance NullEstateData to remember stored estate values and returnRobert Adams2013-07-111-7/+21
| | | | | | | | | | them next time asked. This keeps any estate settings from being reset when the estate dialog is opened in a region with null estate storage.
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge branch 'master' into careminsterMelanie2013-01-041-20/+44
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added locking in NullRegionData.Oren Hurvitz2013-01-021-20/+44
| | | | | | | | This prevents errors when one thread iterates over the regions (e.g., from RegenerateMaptileAndReregister()) while another thread is adding a region.
* | Merge branch 'master' into careminsterMelanie2012-12-091-0/+8
|\ \ | |/
| * Restrict IPresenceData.VerifyAgentBlueWall2012-12-091-8/+3
| | | | | | | | Restrict IPresenceData.VerifyAgent to only return bool result
| * Add agent verification to PresenceBlueWall2012-12-081-0/+13
| |
* | 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.
generated by cgit v1.1 at 2024-12-19 10:42:17 +0000