cf4d291443
Merge branch 'master' into careminster
2013-06-08 00:00:39 +01:00
43cc38dfe1
Merge commit '75631e0267dbf58253dfcf6327b4d65f35bbaa6d' into careminster
2013-06-08 00:00:33 +01:00
07cc16ff9c
Put the configuration back in FetchInventoryDesc2 cap.
2013-06-07 16:00:32 -07:00
3a722ef81b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-07 23:59:02 +01:00
75631e0267
Supply proper type information for the various types of requests
2013-06-07 23:55:03 +01:00
7c0bfca7a0
Adding Avination's PollService to round out the HTTP inventory changes
2013-06-07 23:43:45 +01:00
454499ff60
minor: Comment out debug logging (at warn level) about number of objects force selected and turn down to debug level
2013-06-07 23:38:23 +01:00
ed7fe6239c
add indexes for new visual parameters shape_hover and
...
APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for
now
2013-06-07 23:18:48 +01:00
45e333652c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2013-06-07 23:09:53 +01:00
17a902fed4
Clean up poll service
2013-06-07 22:39:27 +02:00
346eda27cc
minor: add dr0berts to contributors list
2013-06-07 19:26:09 +01:00
f2a4d9b99c
Fix regression where multiple close agents could be sent to the wrong neighbour region on root agent close.
...
This was introduced in git master d214e2d0http://opensimulator.org/mantis/view.php?id=6658
2013-06-07 19:13:24 +01:00
a74e65200c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 19:12:55 +01:00
045c26f626
In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id.
2013-06-07 18:43:00 +01:00
664c6191ed
Mantis #6620 (removed debug message)
2013-06-07 08:37:18 -07:00
dd7404d850
Merge branch 'master' into careminster
2013-06-06 23:50:03 +01:00
ac9c37f31b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-06 23:49:34 +01:00
06012f8675
Fix keyframe motion copyright
2013-06-06 23:49:02 +01:00
c173c2eed5
try to suspend and resume keyframes on copy to inventory to take copy
...
doesn't destroy state
2013-06-06 19:21:21 +01:00
8bfd5c8927
Merge branch 'avination-current' into ubitwork
2013-06-06 19:03:32 +01:00
18e4496d2d
keyframe: add more locks, change timming stop, added Suspend and resume
2013-06-06 18:57:32 +01:00
25fa647a74
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 20:20:22 -07:00
2ebf70d719
Strengthen some assumptions.
2013-06-05 20:19:59 -07:00
fe4a67efb6
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
11b348f73d
Merge branch 'master' into careminster
2013-06-06 03:18:19 +01:00
a3210d1cf8
Database persistence for keyframes. Contains a Migration.
2013-06-06 03:17:38 +01:00
f7835b83d0
Merge branch 'master' into careminster
2013-06-06 03:05:00 +01:00
ea9e1d1a1e
Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster
2013-06-06 03:04:47 +01:00
81ad9255b5
Hook up Keyframe motion to almost everything. Failing to cross a sim border
...
may yield unexpected results in some cases. No database persistence yet,
2013-06-06 03:03:05 +01:00
e1d98c9e4c
Committing Avination's Keyframe module. This is not hooked up yet and will do nothing. More commits to follow.
2013-06-06 02:25:19 +01:00
c5d967b946
Merge branch 'avination-current' into ubitwork
2013-06-06 00:37:06 +01:00
26cd59cd6f
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-06-05 18:55:42 -04:00
e53b62304f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-05 23:44:26 +01:00
a7dbafb0e3
Port Avination's inventory send throttling
2013-06-05 23:42:50 +01:00
e449950030
Prevent processing for Npc
2013-06-05 18:42:15 -04:00
cd64da8746
Cleanup
2013-06-05 18:41:55 -04:00
47ffa12078
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 22:26:42 +01:00
f41fc4eb25
Avoid a deadlock where a script can attempt to take a ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order.
...
This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless).
The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region.
This looks to address http://opensimulator.org/mantis/view.php?id=6557
2013-06-05 22:20:48 +01:00
10572b78f8
Remove a couple of orphaned lines
2013-06-05 15:10:53 -04:00
b4f472c4fa
Make locking more uniform
2013-06-05 15:08:25 -04:00
b5d0ac4c42
BulletSim: default PhysicsTimeStep to same as the simulator's
...
heartbeat timestep when running the physics engine on a separate
thread. This reduces the occurance of heartbeats that happen when
there is no physics step which is seen as vehicle jerkyness.
2013-06-05 07:12:14 -07:00
0c971d148c
BulletSim: fix corner case when rebuilding a compound linkset while
...
a mesh/hull while a mesh or hull is being rebuilt when its asset
is fetched. This fixes a 'pure virtual function' crash when changing
physical state of complex linksets that include many meshes.
2013-06-05 07:09:43 -07:00
02548bdc16
Update HTTP server
2013-06-04 21:11:16 +01:00
648e258b8e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
43d804b998
New HttpServer_OpenSim.dll with increased limits on number of connections, requests, etc.
2013-06-04 12:27:22 -07:00
57c8d82c9e
Fix llTeleportAgentGlobalCoords
2013-06-02 23:53:20 +02:00
e2d4cb870e
Unsit seated avatars when an object is deleted
2013-06-02 23:53:07 +02:00
bd87eb90d1
Implement PERMISSION_TELEPORT and the needed checks to make it work.
...
Old auth system still works as well.
2013-06-02 16:28:28 +02:00
07058b044b
BulletSim: experimental movement of physics execution off of heartbeat
...
thread. Off by default until more testing.
Setting "[BulletSim]UseSeparatePhysicsThread=true" causes the physics
engine to be called on its own thread and the heartbeat thread only
handles the reporting of property updates and collisions. Physics frame
rate is about right but physics execution time goes to zero as accounted
by the heartbeat loop.
2013-06-01 14:52:44 -07:00
d7fa9f671e
Adding standard OpenSim header to source files
2013-05-31 22:03:27 -04:00
Melanie