aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-071-1/+1
|\
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-01-071-1/+1
| |
* | Fix up asset stuffMelanie2012-01-061-0/+3
| |
* | Remove a dangling command registrationMelanie2012-01-051-4/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-062-160/+3
|\ \ | |/ | | | | | | 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-051-43/+2
| | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled.
| * Move asset commands from AssetService to AssetServerConnector so that we can ↵Justin Clark-Casey (justincc)2012-01-051-121/+3
| | | | | | | | | | | | harmonise the same commands on the simulator side. No functional change.
* | Merge branch 'master' into careminsterMelanie2012-01-053-0/+80
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-031-0/+6
| |\
| * | Profile UpdatesBlueWall2012-01-033-0/+80
| | | | | | | | | | | | 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 careminsterMelanie2012-01-026-31/+39
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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-021-0/+6
| |/ | | | | | | hunting. No functional changes.
| * Bring back the Hyperlinker to the Robust console. Moved the config to ↵Diva Canto2011-12-301-30/+25
| | | | | | | | [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
| * Default LocalToGrid to true. Fixes minor bug introduced yesterday where old ↵Diva Canto2011-12-301-5/+1
| | | | | | | | robust UserAccount service would result is LocalToGrid at the sim being false.
| * Set the local grid flag in the user account through the simian connectorMic Bowman2011-12-291-0/+4
| | | | | | | | This should make bi-directional hypergrid work.
| * Added field LocalToGrid in UserAccount. Context: make HG work in Simian.Diva Canto2011-12-291-0/+8
| |
| * HG: more adjustments for making HG Simian work. Added server_uri as new key ↵Diva Canto2011-12-292-1/+4
| | | | | | | | on get_agent_home in UAS.
* | Merge branch 'master' into careminsterMelanie2011-12-282-4/+44
|\ \ | |/
| * HG: more / love for XmasDiva Canto2011-12-242-4/+44
| |
* | Merge branch 'master' into careminsterMelanie2011-12-243-1/+6
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-231-25/+56
| |\
| * | HG: AAdded a few missing /'s at the end of URLsDiva Canto2011-12-233-1/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-231-25/+56
|\ \ \ | | |/ | |/|
| * | Enables processing of hypergrid links through simiangrid services. ThanksMic Bowman2011-12-221-25/+56
| |/ | | | | | | otakup0pe
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * HG: Verify that the user is localDiva Canto2011-12-211-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2011-12-181-0/+1
|\ \ | |/
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-161-0/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-055-4/+6
|\ \ | |/ | | | | | | | | 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 Canto2011-12-041-0/+2
| | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now.
| * HG: Renamed one methodDiva Canto2011-12-044-4/+4
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-281-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-11-241-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-242-20/+49
|\ \ | |/
| * Append asset ID to URL for storage requests to allow caching proxies to work ↵Dan Lake2011-11-231-1/+3
| | | | | | | | with Simian
| * Improve the error messages returned if the HelloNeighbour call fails.Justin Clark-Casey (justincc)2011-11-211-19/+46
| | | | | | | | This is the message a region sends to its neighbours when it comes up
* | Merge branch 'master' into bigmergeMelanie2011-11-195-10/+31
|\ \ | |/ | | | | | | | | 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-192-3/+3
| | | | | | | | | | | | | | 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
| * Improve some grid region log messages to express regions at co-ordinate ↵Justin Clark-Casey (justincc)2011-11-193-8/+21
| | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000)
| * improve region deregistration log messageJustin Clark-Casey (justincc)2011-11-191-1/+4
| |
| * Don't register a region twice on both official registration and maptile ↵Justin Clark-Casey (justincc)2011-11-193-1/+6
| | | | | | | | | | | | regeneration. Maptile storage appears orthogonal to region registration
* | Merge branch 'master' into bigmergeMelanie2011-11-173-28/+27
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * distinguish between FriendsSimConnector and FriendsServiceConnector in logJustin Clark-Casey (justincc)2011-11-152-17/+17
| |
| * Dont' bother with a userAgentService != null check right after we've ↵Justin Clark-Casey (justincc)2011-11-151-11/+10
| | | | | | | | constructed it
* | Merge branch 'master' into bigmergeMelanie2011-11-111-0/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * Make log messages on authentication failure more explicitJustin Clark-Casey (justincc)2011-11-111-13/+26
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Damaged assets, especially appearance textures, could crash the region ↵Snoopy Pfeffer2011-11-061-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server with a fatal exception. Now, such excpetions are caught by an exception handler and just an error message is shown. This was the kind of exception causing these fatal server crashes: APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs^M ^M Exception: System.ArgumentOutOfRangeException: Argument is out of range. Parameter name: offset exceeds the size of buffer at System.Net.Sockets.NetworkStream.BeginRead (System.Byte[] buffer, Int32 offset, Int32 size, System.AsyncCallback callback, System.Object state) [0x00000] in <filename unknown>:0 at HttpServer.HttpClientContext.OnReceive (IAsyncResult ar) [0x00000] in <filename unknown>:0 ^M ^M Application is terminating: True^M
* | Merge branch 'master' into bigmergeMelanie2011-11-051-0/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Multiple lines in welcome message use '\n' in the welcome message tonebadon2011-11-051-0/+3
| | | | | | | | start a new line.
generated by cgit v1.1 at 2024-12-22 16:19:03 +0000