aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2012-01-221-0/+151
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * | Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-222-150/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off.
| * | Telehub Support:BlueWall2012-01-211-0/+150
| | | | | | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
* | | Merge branch 'master' into careminsterMelanie2012-01-211-0/+5
|\ \ \ | |/ /
| * | Telehub Support:BlueWall2012-01-201-0/+5
| | | | | | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
* | | Merge branch 'master' into careminsterMelanie2012-01-161-0/+8
|\ \ \ | |/ /
| * | Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-0/+8
| | | | | | | | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time
* | | Merge branch 'master' into careminsterMelanie2012-01-132-73/+0
|\ \ \ | |/ /
| * | Move some interfaces to a more apropriate placeBlueWall2012-01-122-73/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-121-4/+4
|\ \ \ | |/ /
| * | HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-121-4/+4
| | | | | | | | | | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
* | | Merge branch 'master' into careminsterMelanie2012-01-061-0/+36
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * | Adding empty ISearchModule interfaceBlueWall2012-01-051-0/+36
| |/
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+37
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Profile UpdatesBlueWall2012-01-031-0/+37
| | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
* | Merge branch 'master' into careminsterMelanie2011-12-202-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-203-7/+21
| |\
| * | Commented a couple of verbose debug messages.Diva Canto2011-12-162-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-191-7/+14
|\ \ \ | | |/ | |/|
| * | Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* | | Merge branch 'master' into careminsterMelanie2011-12-182-0/+7
|\ \ \ | |/ /
| * | Fix bug where objects could not be set to a new group if the group had been ↵Justin Clark-Casey (justincc)2011-12-172-0/+7
| |/ | | | | | | | | | | | | | | | | | | created in that client session, or if no other action has been performed on the object. There were two problems here: 1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session 2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag. This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588 This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
* | Merge branch 'master' into careminsterMelanie2011-12-121-24/+55
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Added an option for extra settings within region ini file. Any non-hardcoded ↵Dan Lake2011-12-121-20/+55
| | | | | | | | key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo
* | Merge branch 'master' into careminsterMelanie2011-12-101-0/+3
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-101-0/+3
| |
* | Merge branch 'master' into careminsterMelanie2011-12-104-15/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
| * minor: comment out "unpacked appearance" log mesasge for nowJustin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.Justin Clark-Casey (justincc)2011-12-091-1/+1
| |
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵Justin Clark-Casey (justincc)2011-12-092-13/+7
| | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
* | Merge branch 'master' into bigmergeMelanie2011-12-092-19/+30
|\ \ | |/
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-081-16/+29
| | | | | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-081-3/+1
| | | | | | | | | | The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists. This allows us to eliminate another null check elsewhere and simplifies the method contract
* | Merge branch 'master' into bigmergeMelanie2011-12-083-3/+81
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * On a new client circuit, send the initial reply ack to let the client know ↵Justin Clark-Casey (justincc)2011-12-083-3/+81
| | | | | | | | | | | | | | | | | | it's live before sending other data. This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before. This may stop some avatars appearing grey on login. This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-084-21/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-071-2/+2
| | | | | | | | This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-073-19/+7
| | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
* | Merge branch 'master' into bigmergeMelanie2011-12-0512-15/+210
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-0512-15/+210
| | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Merge branch 'master' into bigmergeMelanie2011-12-053-51/+80
|\ \ | |/ | | | | | | | | 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-032-4/+0
| | | | | | | | | | 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.
| * Improve locking in AgentCircuitManagerJustin Clark-Casey (justincc)2011-12-031-25/+41
| |
| * Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID ↵Justin Clark-Casey (justincc)2011-12-031-37/+54
| | | | | | | | dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
* | Implement ChangeInventoryItemFlagsPacket handlingMelanie2011-12-041-0/+2
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-011-15/+48
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+3
| |
| * With "debug http 1", show the path with the query string instead of just the ↵Justin Clark-Casey (justincc)2011-11-291-21/+21
| | | | | | | | | | | | path. Also simplifies debug levels to just 0 and 1
| * Add "debug http" command for currently simple extra debug logging of ↵Justin Clark-Casey (justincc)2011-11-291-12/+43
| | | | | | | | non-event queue inbound http requests to a simulator
* | Merge branch 'master' into bigmergeMelanie2011-11-283-59/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs