aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-2716-49/+348
| |\ \ | | |/
| | * 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-27198-2302/+6721
| | | |\
| | | * | 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-2711-25/+164
| | | |/ | | |/| | | | | | | | | 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-273-3/+37
|\ \ \ | |/ /
| * | 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' into careminsterMelanie2012-03-2717-58/+91
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-2710-12/+51
| |\ \
| | * | Add Garmin Kawaguichi to CONTRIBUTORS.txtJustin Clark-Casey (justincc)2012-03-271-0/+1
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-2715-138/+531
| | |\ \
| | | * | 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.
| | | * | BulletSim: update BulletSim binaries and configuration fixing a crash which ↵Robert Adams2012-03-265-1/+2
| | | | | | | | | | | | | | | | | | | | happens when there are more than a few hundred physical objects.
| | * | | In TerrainModule.cs, the command terrain save-tile is modified to remove an ↵Garmin Kawaguichi2012-03-271-2/+0
| | | | | | | | | | | | | | | | | | | | unnecessary double argument "minimum Y tile"
| * | | | Send the config section name up to the service classes themselves ↵Diva Canto2012-03-277-46/+40
| | |/ / | |/| | | | | | | | | | (XInventory and Assets).
* | | | Replace HG linker with core versionMelanie2012-03-271-13/+49
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-2612-45/+162
|\ \ \ \ | |/ / /
| * | | 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-2610-41/+149
| |\ \ \
| | * | | BulletSim: update BulletSim.dll and libBulletSim.so with latest versionsRobert Adams2012-03-264-0/+0
| | | | |
| | * | | 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: add updated (but not working) BulletSim dllsRobert Adams2012-03-214-0/+0
| | | | | |
generated by cgit v1.1 at 2024-12-21 01:57:47 +0000