aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2014-01-281-1/+1
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-111-1/+1
| |\
| | * Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.Oren Hurvitz2014-01-111-1/+1
| | |
* | | Intermediate commit. Sill errors.Melanie2014-01-051-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
* | Merge branch 'master' into careminsterMelanie2013-11-081-8/+11
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Give the caller AddMapTile a valid reason response if this failed due to ↵Justin Clark-Casey (justincc)2013-10-291-8/+11
| | | | | | | | | | | | blank response from server or connection failure. Raise log lines which indicate problems to warning from debug
* | Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'avination-current' into careminsterMelanie2013-09-161-1/+7
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | Fix exception when brokering HG asset idsMelanie Thielker2013-09-081-1/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2013-09-072-0/+57
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-022-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another.
* | | 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-291-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2013-07-184-64/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Minor typo in log messageDiva Canto2013-07-141-1/+1
| | |
| * | Guard against unauthorized agent deletes.Diva Canto2013-07-131-4/+3
| | |
| * | Deleted GET agent all around. Not used.Diva Canto2013-07-131-35/+0
| | |
| * | 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.
| * | 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-06-301-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-233-174/+63
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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-213-173/+62
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-131-68/+56
|\ \ \ | |/ /
| * | 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()
| * | 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-04-101-110/+83
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Optimize the number of Simian calls to get the initial presenceMic Bowman2013-04-071-110/+83
| | | | | | | | | | | | information for the friends list. This is a pretty big performance improvement on login. Note that you must upgrade simian to incorporate the corresponding GetSessions call.
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+3
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+3
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' into careminsterMelanie2013-02-274-81/+83
|\ \ | |/ | | | | | | | | | | 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-274-81/+83
| | | | | | | | places where we were not already.
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-101-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations
| * Fixed check for 0 results in GetUserAccounts()Oren Hurvitz2013-02-091-1/+1
| |
generated by cgit v1.1 at 2024-11-17 10:42:13 +0000