aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-271-0/+48
|\
| * Typo fixMelanie2012-03-281-1/+1
| |
| * Fix typosMelanie2012-03-281-2/+2
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-285-16/+175
| |\
| * | Start on Bulk inventory update via CAPS. Not functional yet. HG v2Melanie2012-03-281-0/+48
| | |
* | | More on switching the root folder from under the viewer. More experiments.Diva Canto2012-03-272-15/+18
| |/ |/|
* | 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.
* | 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
|\
| * Let grided simulators retrieve the user's inventory skeletonDiva Canto2012-03-271-1/+1
| |
* | minor: clean up some code formatting in VivoxVoiceModule.csJustin Clark-Casey (justincc)2012-03-271-54/+25
|/
* 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.
* | HG: beginning of a more restrictive inventory access procedure (optional). ↵Diva Canto2012-03-273-3/+37
| | | | | | | | Experimental: we'll try switching the root folder from under the viewer.
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-2710-137/+519
|\ \
| * | BulletSim: make avatar animations update properly.Robert Adams2012-03-263-9/+48
| | | | | | | | | | | | | | | | | | | | | It seems that ODE calls the avatar collision handling routine even if there are no collisions. This causes the animation to be updated. So, for instance, going from HOVER to FLY is caused by the physics engine calling the collision routine each frame with 0 collisions.
| * | Add some more overloads to allow registering overloaded methods and listsMelanie2012-03-262-4/+16
| | | | | | | | | | | | of methods.
| * | BulletSim: fix typo introducted by previous checkins (git merge sometimes ↵Robert Adams2012-03-261-3/+0
| | | | | | | | | | | | makes mistakes)
| * | Merge branch 'bulletsim1'Robert Adams2012-03-265-40/+138
| |\ \
| | * \ Merge branch 'bulletsim1' of ↵Robert Adams2012-03-231-1/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://island.sciencesim.com/home/sceneapi/radams1/bs-opensim into bulletsim1 Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
| | | * | BulletSim: remove confusion between angularVelocity and rotationalVelocity ↵Robert Adams2012-03-223-15/+11
| | | | | | | | | | | | | | | | | | | | (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
| | | * | BulletSim: update TODO list. Rearrange code for readability. Add per object ↵Robert Adams2012-03-212-17/+17
| | | | | | | | | | | | | | | | | | | | friction and restitution runtime settable parameters.
| | | * | BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵Robert Adams2012-03-212-3/+9
| | | | | | | | | | | | | | | | | | | | buoyancy for flying. Tweek avatar default friction and resititution
| | | * | BulletSim: set buoyancy in only one placeRobert Adams2012-03-211-5/+3
| | | | |
| | | * | BulletSim: add some new runtime setable parameters to match the dll.Robert Adams2012-03-212-7/+16
| | | | |
| | | * | BulletSim: Update list of TODO tasksRobert Adams2012-03-211-0/+13
| | | | |
| | * | | BulletSim: change default of shouldDisableContactPoolDynamicAllocation from ↵Robert Adams2012-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
| | * | | BulletSim: Add new configuration parameters to get and set console commandsRobert Adams2012-03-231-4/+32
| | | | |
| | * | | BulletSim: add a bunch of internal Bullet configuration parameters to ↵Robert Adams2012-03-232-0/+43
| | | | | | | | | | | | | | | | | | | | OpenSimDefaults.ini and the code.