| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 1 | -1/+20 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | HG inventory/asset transfers: serialize asset posts. I'm using the same ↵ | Diva Canto | 2012-03-08 | 1 | -1/+20 | |
| | | | | | | | | | pattern as suggested in the patch mantis #5921. Testing it in this smaller context to see how it works. | |||||
| * | | Add a cache on GridService requests | Melanie | 2012-02-24 | 1 | -0/+10 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-23 | 1 | -1/+2 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| | * | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 1 | -1/+2 | |
| | | | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-20 | 1 | -6/+17 | |
| |\ \ | |/ | ||||||
| | * | Amend to last commit: synchronize access to queues. | Diva Canto | 2012-02-20 | 1 | -2/+5 | |
| | | | ||||||
| | * | More improvements on agent position updates: if the target sims fail, ↵ | Diva Canto | 2012-02-20 | 1 | -6/+14 | |
| | | | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||||
| | * | Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends ↵ | Justin Clark-Casey (justincc) | 2012-02-16 | 1 | -1/+1 | |
| | | | | | | | | | grid call would try and contact the wrong uri. Also fixes the build from df960d5 | |||||
| * | | Prevent object loss and positioning outside the region with failed object sim | Melanie | 2012-02-14 | 1 | -1/+4 | |
| | | | | | | | | | crossings | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 9 | -103/+120 | |
| |\ \ | |/ | ||||||
| | * | Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 9 | -103/+120 | |
| | | | | | | | | | exception in service connectors | |||||
| | * | Allow retrival of multiple user records in one operation, analog to presence | Melanie | 2012-01-16 | 2 | -0/+64 | |
| | | | ||||||
| * | | Add methods to allow the groups modules to query online status and last login | Melanie | 2012-01-16 | 2 | -0/+64 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-07 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-01-07 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix up asset stuff | Melanie | 2012-01-06 | 1 | -0/+3 | |
| | | | ||||||
| * | | Remove a dangling command registration | Melanie | 2012-01-05 | 1 | -4/+0 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -39/+0 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||||
| | * | Move simulator asset info commands to an optional module from the connector. ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -43/+2 | |
| | | | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -0/+54 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-03 | 1 | -0/+6 | |
| | |\ | ||||||
| | * | | Profile Updates | BlueWall | 2012-01-03 | 1 | -0/+54 | |
| | | | | | | | | | | | | | 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 careminster | Melanie | 2012-01-02 | 4 | -1/+10 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs | |||||
| | * | | Adding commented out log messages and some minor formatting for future bug ↵ | Justin Clark-Casey (justincc) | 2012-01-02 | 1 | -0/+6 | |
| | |/ | | | | | | | hunting. No functional changes. | |||||
| | * | Set the local grid flag in the user account through the simian connector | Mic Bowman | 2011-12-29 | 1 | -0/+4 | |
| | | | | | | | | | This should make bi-directional hypergrid work. | |||||
| | * | HG: more adjustments for making HG Simian work. Added server_uri as new key ↵ | Diva Canto | 2011-12-29 | 2 | -1/+4 | |
| | | | | | | | | | on get_agent_home in UAS. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-28 | 2 | -4/+44 | |
| |\ \ | |/ | ||||||
| | * | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 2 | -4/+44 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-24 | 3 | -1/+6 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-23 | 1 | -25/+56 | |
| | |\ | ||||||
| | * | | HG: AAdded a few missing /'s at the end of URLs | Diva Canto | 2011-12-23 | 3 | -1/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-23 | 1 | -25/+56 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Enables processing of hypergrid links through simiangrid services. Thanks | Mic Bowman | 2011-12-22 | 1 | -25/+56 | |
| | |/ | | | | | | | otakup0pe | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 1 | -0/+1 | |
| |\ \ | |/ | ||||||
| | * | HG minor bug fix and marked one method obsolete in UAS. | Diva Canto | 2011-12-16 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 2 | -1/+3 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | HG: Added HEAD method to Helo service. This is the preferred method, but its ↵ | Diva Canto | 2011-12-04 | 1 | -0/+2 | |
| | | | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now. | |||||
| | * | HG: Renamed one method | Diva Canto | 2011-12-04 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 2 | -20/+49 | |
| |\ \ | |/ | ||||||
| | * | Append asset ID to URL for storage requests to allow caching proxies to work ↵ | Dan Lake | 2011-11-23 | 1 | -1/+3 | |
| | | | | | | | | | with Simian | |||||
| | * | Improve the error messages returned if the HelloNeighbour call fails. | Justin Clark-Casey (justincc) | 2011-11-21 | 1 | -19/+46 | |
| | | | | | | | | | This is the message a region sends to its neighbours when it comes up | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 2 | -2/+4 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| | * | Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly | |||||
| | * | Don't register a region twice on both official registration and maptile ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+3 | |
| | | | | | | | | | | | | | regeneration. Maptile storage appears orthogonal to region registration | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 2 | -17/+17 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| | * | distinguish between FriendsSimConnector and FriendsServiceConnector in log | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -17/+17 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-04 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||||
| | * | Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size | Mic Bowman | 2011-11-02 | 1 | -1/+1 | |
| | | | | | | | | | | | not a target size. Mono 2.10 appears to try to allocate the full buffer which immediately crashes. Tested on mono 2.6.7 and 2.10.5 | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |