aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | minor: small message adjustment and unnecessary code elimination when ↵Justin Clark-Casey (justincc)2012-03-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | notifying client of no build permission
| * | | | | fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-312-1/+12
| | | | | |
| * | | | | minor: remove some now unneeded code from FriendsCommandsModuleJustin Clark-Casey (justincc)2012-03-301-55/+0
| | | | | |
| * | | | | Make default "show friends" console command show friends fetched from the ↵Justin Clark-Casey (justincc)2012-03-303-8/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | friends service. There is no a --cache option which will show friends from the local cache if available.
| * | | | | refactor: Move "friends show cache" console command out into separate ↵Justin Clark-Casey (justincc)2012-03-304-97/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FriendsCommandsModule. Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
| * | | | | Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵Justin Clark-Casey (justincc)2012-03-305-64/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc.
| * | | | | refactor: Stop passing both IClientAPI and agentID to friend event ↵Justin Clark-Casey (justincc)2012-03-294-27/+58
| | | | | | | | | | | | | | | | | | | | | | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
| * | | | | Add simple regression test for logging in with offline friends. Don't ↵Justin Clark-Casey (justincc)2012-03-291-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | expect to receive any in this instance.
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-291-1/+28
| |\ \ \ \ \
| | * | | | | Also add OSS header to interfaceMelanie2012-03-291-1/+28
| | | | | | |
| * | | | | | Add back parts of reverted changes that were not concerned with child agent ↵Justin Clark-Casey (justincc)2012-03-296-6/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents.
| * | | | | Change namespace on CallingCardModule and correct interface file placemant. ↵Melanie2012-03-292-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | Also ass OpenSource header
| * | | | | Revert "Simplify friends caching by only doing this for root agents - no ↵Justin Clark-Casey (justincc)2012-03-297-29/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions require caching for child agents." We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a.
| * | | | | Revert "Add comment about setting client.SceneAgent in AddNewClient()"Justin Clark-Casey (justincc)2012-03-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 964cae4f37120db34d0d3e2f08ab998215237dfd.
| * | | | | Committing the Avination calling card moduleMelanie2012-03-291-0/+286
| | | | | |
| * | | | | Pushing the Avination Calling card hooks. Module to follow.Melanie2012-03-291-4/+17
| | | | | |
* | | | | | Committing the Avination calling card moduleMelanie2012-03-281-0/+286
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-299-78/+96
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * | | | Add comment about setting client.SceneAgent in AddNewClient()Justin Clark-Casey (justincc)2012-03-291-0/+3
| | | | |
| * | | | Simplify friends caching by only doing this for root agents - no functions ↵Justin Clark-Casey (justincc)2012-03-287-53/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | require caching for child agents. This allows us to avoid unnecessary multiple calls to the friends service. All friends functions originate from the root agent and only go to other root agents in existing code. This also allows us to eliminate complex ref counting.
| * | | | HG 2.0 Suitcase inventory: proof of concept now working properly with the ↵Diva Canto2012-03-281-10/+11
| | | | | | | | | | | | | | | | | | | | heavy SendBulkInventoryUpdate message. Waiting for Melanie to finish the light-weight version of that message.
| * | | | HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the ↵Diva Canto2012-03-282-23/+61
| | | | | | | | | | | | | | | | | | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival.
* | | | | Merge branch 'master' into careminsterMelanie2012-03-282-15/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-271-0/+48
| |\ \ \ \
| | * | | | Typo fixMelanie2012-03-281-1/+1
| | | | | |
| * | | | | More on switching the root folder from under the viewer. More experiments.Diva Canto2012-03-272-15/+18
| | | | | |
* | | | | | Typo fixMelanie2012-03-281-1/+1
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-281-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix typosMelanie2012-03-281-2/+2
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-286-16/+223
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-285-16/+175
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-273-2/+120
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-281-1/+78
| | | |\ \ \ \
| | | * | | | | Add "friends show cache <first-name> <last-name>" command for debugging ↵Justin Clark-Casey (justincc)2012-03-283-2/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly.
| | * | | | | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is ↵Diva Canto2012-03-272-14/+55
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | guarded by an obscure config that no one but me should be using at this point.
| * | | | | | Start on Bulk inventory update via CAPS. Not functional yet. HG v2Melanie2012-03-281-0/+48
| |/ / / / /
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-283-48/+72
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * | | | | Add a corresponding method for items. HG v2Melanie2012-03-281-0/+38
| | | | | |
| * | | | | Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-281-1/+40
| |/ / / / | | | | | | | | | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come
| * | | | minor: Add some documentation to OnNewClient and OnClientClosed eventsJustin Clark-Casey (justincc)2012-03-281-2/+10
| | | | |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-281-1/+1
| |\ \ \ \
| * | | | | minor: clean up some code formatting in VivoxVoiceModule.csJustin Clark-Casey (justincc)2012-03-271-54/+25
| | | | | |
* | | | | | Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-281-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-2711-48/+299
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | Let grided simulators retrieve the user's inventory skeletonDiva Canto2012-03-271-1/+1
| |/ / /
| * | | Two new scripting functions osInviteToGroup(userID) and ↵Snoopy Pfeffer2012-03-275-23/+183
| | | | | | | | | | | | | | | | osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
| * | | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-03-271-1/+1
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-03-27120-1882/+4081
| | |\ \ \
| | * | | | When loading objects from DB, first add to scene, then call ↵Dan Lake2012-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | TriggerOnSceneObjectLoaded.
| * | | | | User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-276-23/+117
| | |/ / / | |/| | | | | | | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.