Justin Clark-Casey (justincc)
db9d9d83eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-14 23:58:16 +01:00
Justin Clark-Casey (justincc)
d412c1b0eb
Don't try to abort worker threads in WebFetchInvDescModule if module was not enabled.
...
This also moves the abort to RemoveRegion() rather than a destructor.
2013-06-14 23:53:20 +01:00
BlueWall
d7f3d7efd2
Merge branch 'master' of /home/opensim/src/opensim
2013-06-13 09:27:13 -04:00
BlueWall
b2c8d5eec7
Add Option: ClassifiedFee
...
Add option to set minimum fee for publishing classifieds. Many viewers have a
hard coded minimum of 50, which makes publishing classifieds fail where grids
have no economy. This allows the grid to set the minimum fee to a suitable
value for their operation.
The option is located in the [LoginService] section and defaults to 0. The
value is sent as "classified_fee" in the login response.
2013-06-13 09:18:27 -04:00
Diva Canto
b271217084
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 17:48:48 -07:00
Diva Canto
7c00ccb548
DataSnapshot: changed those annoying messages to Debug instead of Info.
2013-06-12 17:48:20 -07:00
Justin Clark-Casey (justincc)
6b8e94864a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-13 00:33:53 +01:00
Justin Clark-Casey (justincc)
7759b05dcb
Make XInventoryServicesConnector properly handle a RESULT = false return for methods where this contains failure rather than throwing an exception.
...
Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
2013-06-13 00:31:32 +01:00
teravus
3357300362
* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
2013-06-12 18:13:00 -05:00
Justin Clark-Casey (justincc)
824a4b4808
After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, consistently check for null return and log warning rather than throw exception.
...
This was being done already in some places.
If an exception is thrown it is now an error rather than debug
2013-06-12 23:47:47 +01:00
Justin Clark-Casey (justincc)
ef5be42c86
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 23:32:51 +01:00
Justin Clark-Casey (justincc)
47b6e78790
Implement logging of first 80 characters (debug level 5) or full body data (debug level 6) on outgoing requests, depending on debug level
...
This is set via "debug http out <level>"
This matches the existing debug level behaviours for logging incoming http data
2013-06-12 21:34:20 +01:00
BlueWall
7a17c3720b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-11 21:47:39 -04:00
BlueWall
9fec0faade
Revert "Add option to set minimum fee for classified ads"
...
This reverts commit 90097de6c3
.
2013-06-11 21:46:40 -04:00
Robert Adams
3cb65f0d31
BulletSim: when meshing or asset fetching fails, include position
...
and region with the offending object's name in the error message.
2013-06-11 17:58:08 -07:00
BlueWall
9f8a8f3719
Merge working repo
2013-06-11 20:38:54 -04:00
BlueWall
90097de6c3
Add option to set minimum fee for classified ads
...
Upcoming phoenix-firestorm (4.4.1) adds a configurable option for setting
the minimum price for publishing a classified ad.
http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/43415d69b048
2013-06-11 20:35:25 -04:00
Robert Adams
7556a0f699
Add TriggerScenePresenceUpdated events when an animation is added
...
or removed. Shouldn't impact anyone as only DSG seems to use
OnScenePresenceUpdated event.
Some minor format changes to AnimationSet's ToString().
2013-06-11 17:18:12 -07:00
Justin Clark-Casey (justincc)
135e10ba09
Uncomment Mic's code and split to create new regression TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()
2013-06-11 23:55:45 +01:00
Diva Canto
d8da83b4ff
Removed the lock entirely
2013-06-11 15:50:12 -07:00
Diva Canto
a0fed03e10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-11 15:36:52 -07:00
Diva Canto
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
Melanie
26b66c730e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 21:03:16 +01:00
teravus
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
dahlia
ed950e6c74
Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Addresses Mantis #0006671
2013-06-11 00:29:40 -07:00
dahlia
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
dahlia
9d9b9d4938
llRot2Angle now checks absolute value of s rotation component before normalizing
2013-06-10 17:11:49 -07:00
dahlia
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
teravus
1c7fbb86c2
Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669
2013-06-10 18:47:08 -05:00
dahlia
a949556c4e
add a Normalize() method for LSL_Rotation
2013-06-10 16:42:49 -07:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Mic Bowman
a2f1cd87f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-10 15:15:38 -07:00
Mic Bowman
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
Robert Adams
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
Mic Bowman
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
Talun
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
Diva Canto
e741e5ebce
More on mantis #6666 -- Groups V2 remote connector.
2013-06-09 20:20:37 -07:00
Diva Canto
4e2e69bd25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-08 11:01:20 -07:00
Diva Canto
d00770d56b
Groups V2 -- fix mantis #6666
2013-06-08 11:00:22 -07:00
BlueWall
75e4af9d39
Catch exception triggered by incoming avatars using legacy profiles
2013-06-08 11:00:05 -04:00
BlueWall
34d40e46a5
Merge branch 'profiles'
...
message to explain why this merge is necessary,
2013-06-07 20:17:45 -04:00
BlueWall
1cb1245d84
SQLite support for UserProfiles
2013-06-07 20:14:39 -04:00
BlueWall
1387224821
Ensure selected module is the only active one
2013-06-07 20:09:10 -04:00
Diva Canto
6aa54a8e16
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 16:01:07 -07:00
Diva Canto
07cc16ff9c
Put the configuration back in FetchInventoryDesc2 cap.
2013-06-07 16:00:32 -07:00
Melanie
3a722ef81b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-07 23:59:02 +01:00
Melanie
75631e0267
Supply proper type information for the various types of requests
2013-06-07 23:55:03 +01:00
Melanie
7c0bfca7a0
Adding Avination's PollService to round out the HTTP inventory changes
2013-06-07 23:43:45 +01:00
Justin Clark-Casey (justincc)
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