aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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-3012-85/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-301-120/+218
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Finish up the SuitcaseInventory service.Diva Canto2012-03-291-120/+218
| | | | | | | | | |
| * | | | | | | | | refactor: Stop passing both IClientAPI and agentID to friend event ↵Justin Clark-Casey (justincc)2012-03-296-31/+62
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-298-8/+16
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ass OpenSource header
| * | | | | | | | Revert "Simplify friends caching by only doing this for root agents - no ↵Justin Clark-Casey (justincc)2012-03-299-31/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-290-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Committing the Avination calling card moduleMelanie2012-03-291-0/+286
| | | | | | | | |
| * | | | | | | | Adding the Avination calling card interfaceMelanie2012-03-291-0/+13
| | | | | | | | |
| * | | | | | | | 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-2920-85/+471
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | 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-289-55/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-287-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | BulletSim: update 64 bit libraries and change Linux configuration to use the ↵Robert Adams2012-03-287-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files in the lib32 and lib64 directories as needed.
| * | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-283-23/+430
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 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-283-23/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival.
| * | | | | | | | Enable voice by default on parcels to weaken effects of viewer 2/3 ↵Justin Clark-Casey (justincc)2012-03-281-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParcelVoiceInfoRequest bug Viewer 2/3 contains a bug where the viewer will constantly retry ParcelVoiceInfoRequest requests on voice-disabled parcels where voice is otherwise available. Attempts to fix this server-side have not been successful - sending a non-OK http code (e.g. a 404) just makes the viewer request again immediately. Dropping the request entirely is a bit better but the viewer still retries after a minute. Estate settings already enabled voice by default so doing the same for parcels. This only has an effect if you have any voice system active at all. Ultimately, the re-request bug needs to be fixed viewer-side (LL suffers from the same issue!) but it might be worth implementing the drop request hack.
* | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-282-15/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-273-1/+51
| |\ \ \ \ \ \ \
| | * | | | | | | 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-288-17/+226
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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-282-1/+116
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | 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-283-1/+51
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-284-48/+73
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-282-0/+39
| | | | | | | | |
| * | | | | | | | Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-282-1/+77
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 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-283-4/+2
| |\ \ \ \ \ \ \
| * | | | | | | | 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-282-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come
* | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-2718-53/+347
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | Reverse a conditional in XInventory that made updating system folder evrsion ↵Melanie2012-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numbers impossible
| * | | | | | | Let grided simulators retrieve the user's inventory skeletonDiva Canto2012-03-271-1/+1
| | | | | | | |