300488f862
Merge branch 'master' into careminster
2012-03-28 02:46:54 +01:00
a43e804e59
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-28 02:46:31 +01:00
4007f62158
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 19:09:03 -07:00
300968e933
HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarded by an obscure config that no one but me should be using at this point.
2012-03-27 19:08:29 -07:00
514a9fdf8e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 02:52:11 +01:00
12d3ea3029
Add "friends show cache <first-name> <last-name>" command for debugging purposes.
...
This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly.
2012-03-28 02:51:34 +01:00
0463a00d34
Start on Bulk inventory update via CAPS. Not functional yet. HG v2
2012-03-28 02:45:50 +01:00
b519cf6383
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2012-03-28 02:20:40 +01:00
8c0f1e9058
Add a corresponding method for items. HG v2
2012-03-28 02:10:07 +01:00
710c14fb57
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:49:06 +01:00
445e8bc560
minor: Add some documentation to OnNewClient and OnClientClosed events
2012-03-28 01:08:56 +01:00
cb41fb64be
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 01:06:18 +01:00
2a8b9a47b2
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:15:56 +02:00
b18b1b1d70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
37603ca6da
Reverse a conditional in XInventory that made updating system folder evrsion numbers impossible
2012-03-27 23:11:06 +01:00
db5f46fa23
Let grided simulators retrieve the user's inventory skeleton
2012-03-27 15:24:55 -07:00
b74a89bc12
minor: clean up some code formatting in VivoxVoiceModule.cs
2012-03-27 22:33:42 +01:00
5e07336672
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 14:25:36 -07:00
91950b3147
Amend to previous commit regarding the config name. Bugs bite.
2012-03-27 14:24:59 -07:00
19837ff4dd
Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
2012-03-27 22:30:02 +02:00
5d37a31436
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
2012-03-27 22:16:25 +02:00
7223b63563
User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
2012-03-27 22:09:58 +02:00
971d32fda3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 12:51:58 -07:00
0247d738e2
When loading objects from DB, first add to scene, then call TriggerOnSceneObjectLoaded.
2012-03-27 12:50:58 -07:00
a619621c60
Merge branch 'master' into careminster
2012-03-27 20:03:41 +01:00
de242a29ca
HG: beginning of a more restrictive inventory access procedure (optional). Experimental: we'll try switching the root folder from under the viewer.
2012-03-27 11:54:13 -07:00
6b5f3b49e7
Merge branch 'master' into careminster
2012-03-27 18:11:05 +01:00
2e2634896d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 10:09:08 -07:00
8131a24cde
Send the config section name up to the service classes themselves (XInventory and Assets).
2012-03-27 10:08:13 -07:00
b78224176e
Add Garmin Kawaguichi to CONTRIBUTORS.txt
2012-03-27 02:10:39 +01:00
09c85a6a6c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 02:10:02 +01:00
1aa1a9eb3d
In TerrainModule.cs, the command terrain save-tile is modified to remove an unnecessary double argument "minimum Y tile"
2012-03-27 02:05:57 +01:00
0964af41be
Replace HG linker with core version
2012-03-27 01:46:02 +01:00
872d513daa
BulletSim: make avatar animations update properly.
...
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.
2012-03-26 17:36:33 -07:00
84c9bd52d3
BulletSim: update BulletSim binaries and configuration fixing a crash which happens when there are more than a few hundred physical objects.
2012-03-26 13:48:15 -07:00
0bd0514e81
Merge branch 'master' into careminster
2012-03-26 16:47:02 +01:00
ad865ab4fc
Add some more overloads to allow registering overloaded methods and lists
...
of methods.
2012-03-26 16:46:07 +01:00
2fcdecf090
BulletSim: fix typo introducted by previous checkins (git merge sometimes makes mistakes)
2012-03-26 08:57:40 -07:00
f8879e06d2
Merge branch 'bulletsim1'
2012-03-26 08:49:12 -07:00
3691e39178
BulletSim: update BulletSim.dll and libBulletSim.so with latest versions
2012-03-26 08:48:51 -07:00
da9743d1d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:22:49 +01:00
3810e98474
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:21:15 +01:00
7e0936e4b6
Add a hust UUID to the script invocations
2012-03-26 14:19:55 +01:00
055269805d
Fix compile error in ScriptModuelComms and add some debugging into the modInvoke
...
routines to simplify finding method registration issues.
2012-03-25 22:59:06 -07:00
98a6c78943
Fix the omission on the interface declaration
2012-03-26 03:33:39 +01:00
5f1f956d17
Fix the omission on the interface declaration
2012-03-26 03:32:30 +01:00
2c42dafe56
Fix Typo
2012-03-26 03:26:02 +01:00
e05c72d32f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 03:22:26 +01:00
c9c01d5226
Further simplify ScriptComms
2012-03-26 03:20:40 +01:00
ac0f1ff0a6
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:47:20 +01:00
Melanie