82e3b9a6e0
Fix test for adding temporary assets. Code for non-local temporary assets
...
is there but commented out.
2013-06-10 15:14:55 -07:00
795acaa6aa
BulletSim: add failure flag for meshing failure vs asset fetch failure
...
so error messages make more sense.
Change some BulletSim status log messages from WARN to INFO.
Update TODO list.
2013-06-10 14:12:45 -07:00
57141e34bf
Remove Temporary from use to shortcut asset stores. The Local property
...
differentiates between local & grid storage. The Temporary property just
says that which service handles the it, the asset can be safely removed
in the future.
2013-06-10 13:26:19 -07:00
7de0912a97
Mantis 5346: llAxisAngle2Rot() should normalize before computing
...
Corrected to agree with
http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes
to normalise the vector before computing the quaternion
Signed-off-by: dahlia <dahlia@nomail>
2013-06-10 04:13:34 -07:00
e741e5ebce
More on mantis #6666 -- Groups V2 remote connector.
2013-06-09 20:20:37 -07:00
745a209bf2
Explicitly set uploaded mesh object perms
2013-06-10 01:16:22 +02:00
4e2e69bd25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-08 11:01:20 -07:00
d00770d56b
Groups V2 -- fix mantis #6666
2013-06-08 11:00:22 -07:00
75e4af9d39
Catch exception triggered by incoming avatars using legacy profiles
2013-06-08 11:00:05 -04:00
8582b2b992
Make objects attached from the ground appear in inventory again. Fixes a number
...
of interaction issues causing client crashes.
2013-06-08 02:32:05 +02:00
34d40e46a5
Merge branch 'profiles'
...
message to explain why this merge is necessary,
2013-06-07 20:17:45 -04:00
1cb1245d84
SQLite support for UserProfiles
2013-06-07 20:14:39 -04:00
1387224821
Ensure selected module is the only active one
2013-06-07 20:09:10 -04:00
6aa54a8e16
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 16:01:07 -07:00
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
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
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
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
Mic Bowman