aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-08-173-14/+7
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * minor: remove mono compiler warnings from OpenSim/Services/Connectors/SimianGridJustin Clark-Casey (justincc)2013-08-172-9/+2
| |
| * minor: Make log messages consistent in NeighbourServicesConnectorJustin Clark-Casey (justincc)2013-08-171-6/+6
| |
* | Merge branch 'master' into careminsterMelanie2013-08-072-3/+11
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Remove some debugging from simian connectors.Mic Bowman2013-08-052-3/+11
| |
* | Merge branch 'master' into careminsterMelanie2013-08-0112-282/+757
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-311-0/+179
| | | | | | | | | | | | | | cap is something other than "localhost". A new interface for handling external caps is supported with an example implemented for Simian. The only linden cap supporting this interface right now is the GetTexture cap.
| * A pretty major restructuring of the simian method invocations in order toMic Bowman2013-07-3111-282/+578
| | | | | | | | | | | | | | service access capabilities. In conjunction with the corresponding Simian updates, this enables explicit per-simulator capability-based access to grid services. That enables grid owners to add or revoke access to the grid on a simulator by simulator basis.
* | Merge branch 'master' into careminsterMelanie2013-07-292-1/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Several major improvements to group (V2) chat. Specifically: handle ↵Diva Canto2013-07-271-0/+1
| | | | | | | | | | | | join/drop appropriately, invitechatboxes. The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
| * Force map tiler to save Water.jpg as an actual jpeg format it seems even ↵nebadon2013-07-261-1/+1
| | | | | | | | though we specified jpg extention it was actually a png and thus confusing the viewer silently.
* | Merge branch 'master' into careminsterMelanie2013-07-241-0/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Better version of previous commitDiva Canto2013-07-211-2/+6
| |
| * Add the Current Outfit folder as an available folder in the SuitcaseInventory.Diva Canto2013-07-211-0/+16
| |
* | Merge branch 'master' into careminsterMelanie2013-07-1810-168/+244
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Cleanup old hg sessions (older than 2 days)Diva Canto2013-07-141-0/+3
| |
| * HG UAS: Moved hg-session data from memory to DB storage. This makes it so ↵Diva Canto2013-07-142-90/+199
| | | | | | | | that traveling info survives Robust resets. It should also eliminate the cause of empty IP addresses in agent circuit data that we saw in CC grid. MySQL only.
| * Minor typo in log messageDiva Canto2013-07-141-1/+1
| |
| * Guard against unauthorized agent deletes.Diva Canto2013-07-132-5/+4
| |
| * Deleted GET agent all around. Not used.Diva Canto2013-07-132-37/+0
| |
| * Gatekeeper: stop bogus agents earlier, here at the Gatekeeper. No need to ↵Diva Canto2013-07-131-0/+6
| | | | | | | | bother the sim.
| * Added property to make for more flexible testing.Diva Canto2013-07-111-0/+5
| |
| * Remove a null reference exception in SimianPresenceServiceConnector thatRobert Adams2013-07-101-4/+8
| | | | | | | | occurs when GetGridUserInfo cannot find the requested user info.
| * minor: remove mono compiler warnings from HGSuitcaseInventoryServiceJustin Clark-Casey (justincc)2013-07-091-3/+3
| |
| * A little more debugDiva Canto2013-07-061-1/+1
| |
| * Simina activity detector was too eager. Disabled it in case simian is not ↵Diva Canto2013-07-061-1/+2
| | | | | | | | being used.
* | Merge branch 'master' into careminsterMelanie2013-07-041-2/+18
|\ \ | |/
| * Revert "HG Friends: debug an issue where the friends data stored in the DB ↵Diva Canto2013-07-041-8/+1
| | | | | | | | | | | | is incomplete." This reverts commit 27cdfb7b840423cf8cee08988dc487eeb34d71c7.
| * HG Friends: debug an issue where the friends data stored in the DB is ↵Diva Canto2013-07-041-1/+8
| | | | | | | | incomplete.
| * Deleted debug messages. Fixed a null ref exception on the POST handler of ↵Diva Canto2013-07-021-4/+1
| | | | | | | | GridUserServerPostHandler.cs
| * More debug messagesDiva Canto2013-07-021-1/+5
| |
| * This should have a strong effect on the Unknown User issue mantis #6625Diva Canto2013-07-021-1/+16
| |
* | Merge branch 'master' into careminsterMelanie2013-06-302-4/+5
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Revert "More debug mantis #6625"Diva Canto2013-06-301-1/+0
| | | | | | | | This reverts commit 20f2cf876982b2c7589b67ce4c8f09d8fff3e9f1.
| * More debug mantis #6625Diva Canto2013-06-291-0/+1
| |
| * Changed HG status notifications timeout down to 15secs from the default 100.Diva Canto2013-06-291-1/+1
| |
| * In XAssetService, on a delete asset request also delete the asset in any ↵Justin Clark-Casey (justincc)2013-06-281-3/+4
| | | | | | | | | | | | chained service. This eliminates the async migration since it causes a race condition with the "delete asset" console command
* | Merge branch 'master' into careminsterMelanie2013-06-236-185/+71
|\ \ | |/ | | | | | | | | | | | | 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
| * Change IsLocalRegion from using region handle to using regionID. This was ↵Diva Canto2013-06-221-1/+1
| | | | | | | | affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
| * Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-216-184/+70
| |
* | Merge branch 'master' into careminsterMelanie2013-06-182-2/+20
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2013-06-132-2/+20
| |\
| | * Add Option: ClassifiedFeeBlueWall2013-06-132-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to set minimum fee for publishing classifieds. Many viewers have a hard coded minimum of 50, which makes publishing classifieds fail where grids have no economy. This allows the grid to set the minimum fee to a suitable value for their operation. The option is located in the [LoginService] section and defaults to 0. The value is sent as "classified_fee" in the login response.
* | | Merge branch 'master' into careminsterMelanie2013-06-132-69/+79
|\ \ \ | |/ /
| * | Make XInventoryServicesConnector properly handle a RESULT = false return for ↵Justin Clark-Casey (justincc)2013-06-131-68/+56
| | | | | | | | | | | | | | | | | | methods where this contains failure rather than throwing an exception. Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
| * | After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, ↵Justin Clark-Casey (justincc)2013-06-121-1/+23
| |/ | | | | | | | | | | | | consistently check for null return and log warning rather than throw exception. This was being done already in some places. If an exception is thrown it is now an error rather than debug
| * Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-101-1/+1
| | | | | | | | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future.
* | Merge branch 'master' into careminsterMelanie2013-06-043-0/+348
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Adding standard OpenSim header to source filesBlueWall2013-05-313-0/+81
| |
| * UserProfilesBlueWall2013-05-303-0/+267
| | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.