aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-041-10/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * Improvement in HGInstantMessageService: account for the existence of an ↵Diva Canto2012-12-041-10/+25
| | | | | | | | offline IM service.
* | Merge branch 'master' into careminsterMelanie2012-11-171-0/+33
|\ \ | |/
| * The last few AssemblyInfos. Finished!Diva Canto2012-11-141-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-11-091-1/+22
|\ \ | |/
| * HG: Hopefully this fixes the issues with port 80 once and for all.Diva Canto2012-11-071-1/+22
| |
* | 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 'master' into careminsterMelanie2012-11-031-5/+5
|\ \ | |/
| * HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ↵Diva Canto2012-11-021-5/+5
| | | | | | | | THESE.
* | Merge branch 'master' into careminsterMelanie2012-10-202-2/+2
|\ \ | |/
| * Improve efficiency of friends notification by only make one PresenceService ↵Justin Clark-Casey (justincc)2012-10-202-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 commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-271-4/+27
|\ \ | |/
| * Use GridUser properly for foreign users.Diva Canto2012-09-261-4/+27
| |
* | Merge branch 'master' into careminsterMelanie2012-09-243-14/+177
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * HG 2.0: User Agent Service now can also control where the local users can ↵Diva Canto2012-09-221-3/+100
| | | | | | | | go. Domain-name and user-level based. \o/
| * More HG 2.0: access control at the Gatekeeper. \o/Diva Canto2012-09-211-8/+54
| |
| * Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-211-1/+1
| |
| * Improvement over last commit: refactor the asset permissions code, so that ↵Diva Canto2012-09-201-58/+5
| | | | | | | | it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
| * More HG2.0: Added permission policies in HGAsset Service based on asset ↵Diva Canto2012-09-201-3/+76
| | | | | | | | types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
* | Merge branch 'master' into careminsterMelanie2012-09-161-4/+57
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * More on HG2.0: added the possibility of controlling the appearance that ↵Diva Canto2012-09-151-0/+1
| | | | | | | | avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
| * Restarting to work on HGSuitcaseInventoryService: added the ability for the ↵Diva Canto2012-09-131-4/+56
| | | | | | | | outside world to retrieve appearance items. Not ACLed yet.
* | Merge branch 'master' into careminsterMelanie2012-07-013-17/+15
|\ \ | |/
| * Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-303-17/+15
| |
* | Merge branch 'master' into careminsterMelanie2012-04-081-50/+56
|\ \ | |/
| * A few more minor improvements on Suitcase inventory service.Diva Canto2012-04-071-7/+6
| |
| * Better Suitcase Inventory Service.Diva Canto2012-04-061-48/+55
| |
* | Merge branch 'master' into careminsterMelanie2012-04-072-105/+193
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-061-594/+0
| |
| * WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on ↵Diva Canto2012-04-061-36/+712
| | | | | | | | purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
| * Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-061-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-03-311-120/+218
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Finish up the SuitcaseInventory service.Diva Canto2012-03-291-120/+218
| |
* | Merge branch 'master' into careminsterMelanie2012-03-291-0/+368
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the ↵Diva Canto2012-03-281-0/+368
| | | | | | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival.
* | Merge branch 'master' into careminsterMelanie2012-03-273-4/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-272-2/+25
| |\
| | * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-272-2/+25
| | | | | | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
| * | Amend to previous commit regarding the config name. Bugs bite.Diva Canto2012-03-271-2/+0
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-272-36/+8
|\ \ | |/
| * Send the config section name up to the service classes themselves ↵Diva Canto2012-03-272-36/+8
| | | | | | | | (XInventory and Assets).
* | Merge branch 'master' into careminsterMelanie2012-03-222-0/+109
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-212-0/+109
| | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
* | Merge branch 'master' into careminsterMelanie2012-03-212-0/+311
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-201-0/+301
| | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
| * Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵Diva Canto2012-03-171-0/+10
| | | | | | | | direct user connections.
* | Merge branch 'master' into careminsterMelanie2012-03-091-2/+3
|\ \ | |/
generated by cgit v1.1 at 2024-10-23 03:30:50 +0000