a0fed03e10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-11 15:36:52 -07:00
b33db917f5
Really bad idea to lock m_UserCache for so long in UserManagementModule. Added a special lock object instead, if we really want to avoid concurrent executions of that code.
2013-06-11 15:36:27 -07:00
26b66c730e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 21:03:16 +01:00
d47a18fd09
* Adds KeyFrameMotion storage support to SQLite, just a note, seems that there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this.
...
* Has a prim table migration.. that might take a while, hold on to your hats.
* Fixes a null-ref when shutting down while keyframed motion is active.
2013-06-11 08:56:20 -05:00
ed950e6c74
Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Addresses Mantis #0006671
2013-06-11 00:29:40 -07:00
ba84074468
LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization fails
2013-06-10 17:54:14 -07:00
9d9b9d4938
llRot2Angle now checks absolute value of s rotation component before normalizing
2013-06-10 17:11:49 -07:00
b242ead6df
llRot2Axis now checks absolute value of s rotation component before normalizing. Also removed some excessive division and cleaned up a bit
2013-06-10 17:10:04 -07:00
1c7fbb86c2
Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669
2013-06-10 18:47:08 -05:00
a949556c4e
add a Normalize() method for LSL_Rotation
2013-06-10 16:42:49 -07:00
7af97f88b7
Add port numbers to poll service thread names so that we can tell which belong to which HttpServer
2013-06-10 23:39:17 +01:00
32d1e50565
Reinstate explicit starting and stopping of PollServiceRequestManager added in 3eee991 but removed in 7c0bfca
...
Do not rely on destructors to stop things.
These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503
and most probably http://opensimulator.org/mantis/view.php?id=6668
2013-06-10 23:30:35 +01:00
a2f1cd87f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-10 15:15:38 -07:00
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
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
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
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
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
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
a3210d1cf8
Database persistence for keyframes. Contains a Migration.
2013-06-06 03:17:38 +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
Diva Canto