| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-06-30 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | Changed HG status notifications timeout down to 15secs from the default 100. | Diva Canto | 2013-06-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-06-23 | 2 | -165/+41 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | Finally moved HG agent transfers to use agent fatpacks. | Diva Canto | 2013-06-21 | 2 | -165/+41 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 2 | -42/+41 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | Make sure we dispose of WebResponse, StreamReader and Stream in various ↵ | Justin Clark-Casey (justincc) | 2013-02-27 | 2 | -42/+41 |
| | | | | | | | | | places where we were not already. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | HG: Hopefully this fixes the issues with port 80 once and for all. | Diva Canto | 2012-11-07 | 1 | -1/+1 |
| | | | |||||
| | * | Revert "Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef. | ||||
| | * | Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 2 | -0/+2 |
| | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-05-10 | 2 | -0/+0 |
| |\ \ | |/ | |||||
| | * | Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵ | Justin Clark-Casey (justincc) | 2012-05-09 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | | the actual class names. This is usually because the file name was singular (*Service*) but the class name was plural (*Services*). This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector. This does not affect existing configuration since the files are being renamed rather than the classes. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 1 | -5/+20 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | ||||
| | * | Remember to dispose of the bitmap opened from a file in ↵ | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -4/+11 |
| | | | | | | | | | GatekeeperServiceConnector.GetMapImage() | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 2 | -0/+53 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | HG Friends: reroute the status notifications to the HGFriends service, so ↵ | Diva Canto | 2012-03-21 | 2 | -0/+53 |
| | | | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 2 | -9/+119 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| | * | HG Friends: allow the establishment of HG friendships without requiring ↵ | Diva Canto | 2012-03-20 | 1 | -8/+59 |
| | | | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY. | ||||
| | * | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵ | Diva Canto | 2012-03-17 | 1 | -1/+60 |
| | | | | | | | | | direct user connections. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 1 | -6/+9 |
| |\ \ | |/ | |||||
| | * | Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -6/+9 |
| | | | | | | | | | exception in service connectors | ||||
| * | | 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 |
| | | | |||||
| * | | 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 | ||||
| | * | 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 | 2 | -1/+4 |
| |\ \ | |/ | | | | | | | | | | | | | 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 | ||||
| | * | 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 | 1 | -2/+25 |
| |\ \ | |/ | |||||
| | * | HG: more / love for Xmas | Diva Canto | 2011-12-24 | 1 | -2/+25 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-24 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | HG: AAdded a few missing /'s at the end of URLs | Diva Canto | 2011-12-23 | 1 | -1/+1 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | Bring us up to date. | Tom | 2011-09-14 | 1 | -12/+12 |
| |\ \ | |/ | |||||
| | * | Increase information in logging for UserAgentServiceConnector. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -12/+12 |
| | | | | | | | | | Done for http://opensimulator.org/mantis/view.php?id=5669 | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -35/+36 |
| |\ \ | |/ | |||||
| | * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -35/+36 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Only send AgentOnline to the client if the friendsOnline list has elements. ↵ | Diva Canto | 2011-06-11 | 1 | -1/+1 |
| | | | | | | | | | Also, increased the timeout on UserAgentServiceConnector, StatusNotification again. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-11 | 1 | -12/+23 |
| |\ \ | |/ | |||||
| | * | More tweaking on the UserAgentServiceConnector: add constructor that does ↵ | Diva Canto | 2011-06-10 | 1 | -13/+22 |
| | | | | | | | | | not do DNS lookup, and use that for friends notification. | ||||
| | * | Decreased timeout of HG StatusNotification to 4secs. ↵ | Diva Canto | 2011-06-10 | 1 | -1/+1 |
| | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5516 | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -0/+529 |
| |\ \ | |/ | |||||
| | * | This hopefully fixes all issues with online/offline notifications across ↵ | Diva Canto | 2011-06-07 | 1 | -2/+53 |
| | | | | | | | | | grids. http://opensimulator.org/mantis/view.php?id=5528 | ||||
| | * | Commented a few extra debug messages. | Diva Canto | 2011-05-26 | 1 | -2/+0 |
| | | | |||||
| | * | HG IM in grid mode working fairly well. Unknown target user references ↵ | Diva Canto | 2011-05-26 | 1 | -0/+61 |
| | | | | | | | | | looked back in source user's User Agent service. | ||||
| | * | HG: Instant Message working. Tested on HG standalones only. Needs a lot more ↵ | Diva Canto | 2011-05-25 | 1 | -0/+58 |
| | | | | | | | | | testing. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |