25ed1658ca
Merge branch 'master' into careminster
2013-06-23 01:35:09 +01:00
4bf1afe300
Fix prim locking to behave like SL
2013-06-23 01:34:35 +01:00
56f4adeb60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00
694c4bcbb6
correct method doc for llRot2Axis()
2013-06-14 20:00:20 -07:00
e6cb7b4764
Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfileModule since in the presence of writes these are not thread-safe operations.
...
Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together
2013-06-15 00:52:57 +01:00
42b0c68eab
Correct build break in previous commit 9c530d7
2013-06-15 00:46:55 +01:00
9c530d725f
refactor: In UserProfileModule, change classifiedCache and classifiedInterest to m_classifiedCache and m_classifiedInterest
...
This is the coding standard name style for private fields.
2013-06-15 00:41:02 +01:00
ecfc6a3f4a
Add the standard OpenSimulator copyright notice to the top of InventoryCache.cs
2013-06-15 00:36:16 +01:00
720806b661
Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache isn't needed since it's thread safe but r/w of contained dictionaries isn't thread-safe
2013-06-15 00:34:45 +01:00
da3724a904
minor: remove mono compiler warnings from LSL_Api, properly format method doc for llRot2Axis()
2013-06-15 00:11:36 +01:00
f074739e33
Mantis 6280: llSetContentType(). An implementation.
...
An implimentation of llSetContentType including all of the new
constants added since the mantis was raised.
2013-06-15 00:06:03 +01:00
fc89bde044
Mantis 6108: ossetprimitiveparams temporary/phantom problem
...
Corrected to ensure that the target prim is updated by
osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM
instead of the prim that the script is in.
2013-06-15 00:00:00 +01:00
db9d9d83eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-14 23:58:16 +01:00
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
d7f3d7efd2
Merge branch 'master' of /home/opensim/src/opensim
2013-06-13 09:27:13 -04:00
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
9975c5674c
Merge branch 'master' into careminster
2013-06-13 02:49:43 +01:00
b271217084
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 17:48:48 -07:00
7c00ccb548
DataSnapshot: changed those annoying messages to Debug instead of Info.
2013-06-12 17:48:20 -07:00
6b8e94864a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-13 00:33:53 +01:00
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
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
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
ef5be42c86
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 23:32:51 +01:00
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
7a17c3720b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-11 21:47:39 -04:00
9fec0faade
Revert "Add option to set minimum fee for classified ads"
...
This reverts commit 90097de6c3
2013-06-11 21:46:40 -04:00
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
9f8a8f3719
Merge working repo
2013-06-11 20:38:54 -04:00
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
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
135e10ba09
Uncomment Mic's code and split to create new regression TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()
2013-06-11 23:55:45 +01:00
d8da83b4ff
Removed the lock entirely
2013-06-11 15:50:12 -07:00
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
e40d362f3d
Merge branch 'master' into careminster
2013-06-11 21:03:27 +01:00
26b66c730e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 21:03:16 +01:00
162dfd8a38
Merge branch 'avination-current' into careminster
2013-06-11 21:03:02 +01:00
400f876d98
Merge branch 'master' into careminster
2013-06-11 21:01:58 +01:00
a4a4898a0e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 20:39:09 +02: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
6b55be6e2f
Merge branch 'master' into careminster
2013-06-11 01:04:50 +01:00
a022ee5766
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-06-11 01:03:15 +01: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
Melanie