aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-061-1/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Changed protection of CreateDefaultAppearanceEntries to protected, so ↵Diva Canto2013-02-051-1/+1
| | | | | | | | extensions of the UserAccountService can reuse this.
* | Merge branch 'master' into careminsterMelanie2013-02-0516-16/+16
|\ \ | |/ | | | | | | | | | | | | 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-0516-16/+16
| | | | | | | | | | | | | | | | 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 careminsterMelanie2013-01-042-8/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Allow registering regions whose names are equivalent under LIKE but not ↵Oren Hurvitz2013-01-022-8/+8
| | | | | | | | truly equal
* | Merge branch 'master' into careminsterMelanie2013-01-021-1/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Fixed bugs when getting the root folder.Oren Hurvitz2013-01-021-1/+10
| | | | | | | | | | | | | | | | 1. The error checking for the case where there's no "My Inventory" folder was incorrect: it checked the wrong variable. 2. If GetSystemFolderForType() is called to get AssetType.RootFolder then it should return the root folder immediately; not look for another root folder below it.
* | Merge branch 'avination' into careminsterMelanie2012-12-211-0/+17
|\ \
| * | Add the interfaces for the new Avination baked texture cache serviceMelanie2012-12-191-0/+17
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-12-181-1/+8
|\ \ \ | |/ /
| * | add some default size setting and checksUbitUmarov2012-12-071-1/+6
| | |
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-1/+3
| | | | | | | | | | | | since at least for now seems good enought
* | | 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-12-042-10/+140
|\ \ \ | |/ / | | / | |/ |/| Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * Improvement in HGInstantMessageService: account for the existence of an ↵Diva Canto2012-12-042-10/+140
| | | | | | | | offline IM service.
* | Merge branch 'master' into careminsterMelanie2012-11-1721-783/+745
|\ \ | |/
| * Remove old InventoryService, which has for a long time been replaced by ↵Justin Clark-Casey (justincc)2012-11-172-782/+0
| | | | | | | | XInventoryService.
| * 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
| * Do not allow invariants to change on calls to XInventoryService.UpdateItem()Justin Clark-Casey (justincc)2012-11-172-10/+140
| | | | | | | | | | | | | | | | This is to help track down http://opensimulator.org/mantis/view.php?id=6359 where creator IDs on items and rezzed objects have been reported to sometimes change. This should never happen - a particular item should never change creators (if an item is given then a new item (with new id) is created). Invariants are inventory type, asset type, folder (changed only on MoveItems()), CreatorIdentification and Owner. If caller attempts to change an invariant, warning is logged but other properties are still changed. If you see this warning, reporting on Mantis 6359 would be very welcome with the exact operation being done at the time.
| * Add basic XInventoryServicesTests.TestAddItem() regression test.Justin Clark-Casey (justincc)2012-11-171-0/+87
| |
| * The last few AssemblyInfos. Finished!Diva Canto2012-11-1416-0/+528
| |
* | 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-093-12/+24
|\ \ | |/
| * Update parent inventory folder version numbers when folders are ↵Justin Clark-Casey (justincc)2012-11-091-10/+1
| | | | | | | | | | | | | | | | moved/created/deleted to match version numbers cached by viewers. This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders). This should hopefully improve viewer reuse of its cached inventory information. Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
| * HG: Hopefully this fixes the issues with port 80 once and for all.Diva Canto2012-11-072-2/+23
| |
* | Merge branch 'master' into careminsterMelanie2012-11-041-0/+9
|\ \ | |/
| * HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder ↵Diva Canto2012-11-031-0/+9
| | | | | | | | with parentID=UUID.Zero
* | 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-11-033-36/+9
|\ \ \ | | |/ | |/|
| * | HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ↵Diva Canto2012-11-021-5/+5
| | | | | | | | | | | | THESE.
| * | Move check to allow only deletion of maptiles up to AssetServerDeleteHandler ↵Justin Clark-Casey (justincc)2012-11-022-31/+4
| | | | | | | | | | | | | | | | | | | | | | | | from AssetService. This allows us to use a common check for both AssetService and XAssetService. It also allows future console commands to delete an asset. As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
* | | Merge branch 'master' into careminsterMelanie2012-10-311-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Add method doc to IAssetService.Get(string, object, AssetRetrieved) ↵Justin Clark-Casey (justincc)2012-10-301-1/+5
| | | | | | | | | | | | | | | | | | outlining the situations in which AssetRetrieved may be called back with a null AssetBase. These situations include asset not found and remote service not responding.
* | | Merge branch 'master' into careminsterMelanie2012-10-204-5/+41
|\ \ \ | |/ /
| * | Add method doc for IPresenceServiceJustin Clark-Casey (justincc)2012-10-201-1/+37
| | |
| * | Improve efficiency of friends notification by only make one PresenceService ↵Justin Clark-Casey (justincc)2012-10-203-4/+4
| | | | | | | | | | | | | | | | | | 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-124-29/+42
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: Add documentation to IGridService.GetRegionFlags()Justin Clark-Casey (justincc)2012-10-091-0/+13
| | |
| * | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵Justin Clark-Casey (justincc)2012-10-093-29/+29
| | | | | | | | | | | | 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-042-4/+9
| |\ \
| | * | Make the asset retrieval concurrency a config switch. The current valueMic Bowman2012-10-041-3/+8
| | | | | | | | | | | | | | | | | | | | of 30 is still hanging badly on some mono versions. The switch defaults to 30 to preserve current behavior.
generated by cgit v1.1 at 2024-12-23 10:22:41 +0000