aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge branch 'master' into careminsterMelanie2012-12-091-1/+1
|\ \ | |/
| * Trying to prevent old route of sending attachments, simulator version ↵Diva Canto2012-12-061-1/+1
| | | | | | | | unknown maybe due to timeout. mantis #6450
* | Merge branch 'master' into careminsterMelanie2012-11-172-1/+33
|\ \ | |/
| * Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-171-1/+0
| | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
| * The last few AssemblyInfos. Finished!Diva Canto2012-11-141-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-11-137-7/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-127-7/+7
| |
* | Merge branch 'master' into careminsterMelanie2012-11-091-1/+1
|\ \ | |/
| * HG: Hopefully this fixes the issues with port 80 once and for all.Diva Canto2012-11-071-1/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-11-041-4/+4
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Squash reporting HelloNeighbor exception - it simply means the other simMelanie2012-11-021-4/+4
| | | | | | | | | | | | is down, no need for yellow ink.
* | | Merge branch 'master' into careminsterMelanie2012-10-201-2/+2
|\ \ \ | | |/ | |/|
| * | Improve efficiency of friends notification by only make one PresenceService ↵Justin Clark-Casey (justincc)2012-10-201-2/+2
| | | | | | | | | | | | | | | | | | call for all friends rather than one for each friend. However, large groups could still take a very long time since we still need to message each avatar on different simulators.
* | | Merge branch 'master' into careminsterMelanie2012-10-161-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
| * | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now.Justin Clark-Casey (justincc)2012-10-161-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-121-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵Justin Clark-Casey (justincc)2012-10-091-2/+2
| | | | | | | | | | | | easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
* | | Merge branch 'avination' into careminsterMelanie2012-10-071-16/+21
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | Fix threading in remote asset connectorMelanie2012-10-051-16/+21
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-072-4/+15
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-10-041-3/+8
| |\ \
generated by cgit v1.1 at 2025-01-31 11:42:35 +0000