ac65085cc3
XmlRpcGridRouter
...
Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called.
See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or
https://github.com/BlueWall/XmlRpcRouter
for php gateway and test code.
2012-12-03 20:16:44 -05:00
787636b97a
BulletSim: Reduce idle region physics overhead where there are MANY
...
static objects by more restrictive selection of objects that collide
with static objects.
Rename collision mask fuctions from 'filter' to 'group' so it is clear
what is being set.
Rename BulletSimAPI.SetCollisionFilterMask() to SetCollisionGroupMask to match above.
Restore passing of time step to linear and angular motion component routines.
Use buffering vehicle physical parameter get/set routines consistantly.
Make range enforcement clearer by using ClampInRange() function for parameter setting.
Remove commented out experimental vehicle calculations.
2012-12-03 16:25:51 -08:00
5d4b7d537d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-03 21:26:36 +01:00
b7c3a4fa7f
Merge branch 'avination' into ubitwork
2012-12-03 19:46:16 +01:00
8aa5fdb6a3
*TEST* diferent avatar collider
2012-12-03 19:45:45 +01:00
f21d990820
fix vertex rounding direction
2012-12-03 19:41:29 +01:00
aa00308b10
*TEST* reduce all mesh vertices resolution to 1e-5. This reduces number
...
of unique vertices only originated by math errors in PrimMesher
2012-12-03 19:41:21 +01:00
c50fda8bf5
adjust avatar standing Z position
2012-12-03 19:41:14 +01:00
d3904ff484
Add a transaction ID to the money module path for llTransferLindenDollars
2012-12-03 19:34:22 +01:00
41f1c5b7f7
BulletSim: rework angular corrections to remove any hybrid code and compute absolute collections.
2012-12-03 07:59:56 -08:00
2586bab2dd
BulletSim: add stubs for generalization of preStep actions. Will eventually replace the specialized vehicle processing with preStep event processing. Add TODO comments about this feature. Redo line endings in TODO file to be all Linux.
2012-12-03 07:59:52 -08:00
dc0497c1b8
BulletSim: begin tracking a TODO list. There just are so many things to remember to do.
2012-12-03 07:59:49 -08:00
10fcc70b36
BulletSim: revert angular vertical attraction from motor to code. The motor code did not return the restoring difference but the current value. Remove unused commented out code.
2012-12-03 07:59:46 -08:00
f9fed421fe
BulletSim: format vehicle detail logging messages so vehicle changs are grouped better in the log output.
2012-12-03 07:59:42 -08:00
20c3ec7d92
BulletSim: localize vehicle property setting so the vehicle prim is only updated at the end of the vehicle simulation step and the push of the physics property update event only happens if the properties are actually changed.
2012-12-03 07:59:39 -08:00
b124aae05e
BulletSim: Add DumpActivationInfo2 function. Change static objects from DISABLE_SIMULATION to ISLAND_SLEEPING. Update DLLs and SOs to add DumpActivationInfo2 function.
2012-12-01 15:39:13 -08:00
9c7c703360
Merge branch 'avination' into ubitwork
2012-12-01 12:39:55 +00:00
ec63e4ff29
BulletSim: remove time scaling of computed vehicle absolute velocity since Bullet will scale the movement by the time slice. Restore LIMIT_MOTOR_UP to definitition of BOAT simce some vehicle engines use it even for land vehicles. Push vehicle parameter updates through the regular property update to solve vehicles floating off when they should be stopped.
2012-11-29 22:21:45 -08:00
56b2bc7101
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/Manager/IMesher.cs
2012-11-30 01:54:13 +00:00
daa1d99513
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-11-30 01:19:08 +00:00
0bda35e18f
BulletSim: add copyright header where it is missing. Remove some unnecessary 'using' requirements so testing framework is less complicated.
2012-11-29 09:53:59 -08:00
0cd99c74a7
BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables mesh caching. Since BulletSim caches and tracks the unmanaged memory version of meshes, the Meshmerizer itself does not need to cache built meshes once BulletSim has made the physical proxy mesh.
2012-11-29 09:24:53 -08:00
b8a7cbb9e9
BulletSim: reverse direction of hover correction. Removes problem with vehicles being orbited.
2012-11-29 08:03:30 -08:00
2ccd4c1302
BulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from TYPE_BOAT definition.
2012-11-28 09:48:48 -08:00
0a66317fa6
BulletSim: move GetWaterLevelAtXYZ from BSScene to BSPhysTerrain.
2012-11-28 09:48:33 -08:00
d656ec8f33
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-27 21:11:19 -08:00
92a766e8cb
Bug fix in Offline IM for inventory transfers. The items were being placed twice in the receiver's inventory.
2012-11-27 21:10:58 -08:00
aae76f7be4
Stop logging spurious asset data for {0} is zero length error for sculpts/mesh
...
ODEPrim, for instance, always hits this code path twice at the moment
Firstly before any sculpt data has been loaded (hence the spurious message)
Secondly when any sculpt data has been loaded or failed to load (when the message would be valid).
Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead
(though this is not ideal since it requires all physics plugins to copy/paste similar code).
2012-11-28 02:01:04 +00:00
8a1d3b322f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-28 02:00:34 +00:00
c17ea2049b
Show many more primitive properties on console command "show part name/id/pos"
2012-11-28 01:42:58 +00:00
a82f699f43
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-27 14:43:01 -08:00
2cd88787af
Prevent the core Groups module from being enabled when its name doesn't match the "default" ini choice
2012-11-27 14:42:28 -08:00
8e459a0346
BulletSim: reorganize linear movement routine into separate subroutines enabling external calibration routines and unit tests.
2012-11-27 10:04:00 -08:00
a5100cafee
BulletSim: fix terrain mesh generation for problem with regions that have unequal edge heights. Thanks UBit.
2012-11-27 10:03:55 -08:00
68fe7dff20
BulletSim: reorganize angular movement routine into separate subroutines enabling external calibration routines and unit testing.
2012-11-27 10:03:49 -08:00
59554758b1
BulletSim: implementation of vertical attraction motor.
2012-11-27 10:03:44 -08:00
9e0db36c82
BulletSim: add 'infinite' timescale that does not reduce motor target or friction.
2012-11-27 10:03:38 -08:00
16e4019eca
Fix database service unit test failures by temporarily reverting BasicDataServiceTest extending OpenSimTestCase.
...
Mono 2.4.3 doesn't like this when running nunit, with nunit throwing
AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true.
and similar. Mono 2.10.8.1 does not have this issue.
So will wait until min version of mono bumps before restoring.
2012-11-26 22:25:36 +00:00
5685b33071
BulletSim: increase vehicle stability by suppressing Bullet's update to angular velocity.
2012-11-26 10:47:34 -08:00
88f2fbc8f1
Merge branch 'master' into connector_plugin
2012-11-26 06:55:03 -05:00
084e3926ca
BulletSim: use m_angularMotor to do the basic movement. Add the setting of same. Rename the angular forces and add comments to match MoveAngular to the form of MoveLinear.
2012-11-25 20:04:33 -08:00
d7126a14e1
BulletSim: up the vehicle angular damping to 0.95. Still trying to overcome the movement added by Bullet.
2012-11-25 20:04:33 -08:00
4c077a0694
BulletSim: organize MoveLinear code for understandability. Make LIMIT_MOTOR_UP contribution a velocity and not a force.
2012-11-25 20:04:32 -08:00
f977131fe0
BulletSim: add ToString override to BSVMotor.
2012-11-25 20:04:32 -08:00
319ec3235c
BulletSim: add BSVMotor as BSDynamics linear motor.
...
Properly limit *_MOTOR_DECAY_TIMESCALE to 120 as per specs.
Invode BSDynamics.Refresh() when vehicle type is changed. Previously
the vehicle properties weren't getting set because the physical
properties were set before the vehicle type was set.
Add a "use name" to BSMotors for identification while debugging.
Correct current and target confusion in BSVMotor design.
Rename CurrentValueReductionTimescale to FrictionTimescale.
Event more detailed logging.
2012-11-25 20:04:31 -08:00
980edabc2e
BulletSim: clean up TODO list. It is kept somewhere wlse that should be more public. Add error logging for the detail log writer so a message is output when it cannot write to the specified logging directory. Modify friction defaults to be closer to ODE's values. Add new collision margin and vehicle angular damping parameters.
2012-11-25 20:04:29 -08:00
9a42405944
BulletSim: small change to add position correction force with AddForce rather than just storing it in the variable
2012-11-25 20:04:28 -08:00
22d5bf8ff9
BulletSim: complete vector motor. Correct line endings.
2012-11-25 20:04:28 -08:00
d1480ac7ee
BulletSim: add terrain collision margin and vehicle angular damping
...
parameters to the parameter block.
New API call for setting collision margin.
2012-11-25 20:04:27 -08:00
c3f30fef96
BulletSim: add parameter for terrain collision margin.
...
Add locking around unlikely but possible race conditions on terrain list.
2012-11-25 20:04:27 -08:00
4ae30873ad
BulletSim: Add tables and initialization for different attributes for different materials. For the moment, the per material tables are not used.
2012-11-25 20:04:26 -08:00
c754003944
Merge branch 'master' into connector_plugin
...
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
2012-11-25 17:03:14 -05:00
cf670c01cc
Merge branch 'avination' into careminster
2012-11-25 14:14:20 +00:00
fd7a83f439
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
2012-11-25 14:13:50 +00:00
a118001181
* Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339
2012-11-24 22:09:34 -05:00
62244b5ea5
don't zero constant force and torque in selection
2012-11-24 22:46:24 +00:00
02db8b9adb
Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are functionally identical.
...
Move TestDeleteSceneObjectAsync() and TestDeleteSceneObjectAsyncToUserInventory() from SceneObjectBasicTests -> SceneObjectDeRezTests
2012-11-24 03:49:23 +00:00
f254af29ac
avoid potencial NullReferenceException
2012-11-24 03:39:37 +00:00
a4ce63d0cd
Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a BasicInventoryAccessModule() and re-enable in test suite.
2012-11-24 03:38:15 +00:00
22d4c52ffc
Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests
2012-11-24 03:15:24 +00:00
e9be85442f
In ArchiverTests, use the local instantiated SceneManager rather than potentially cross-contaminating tests by relying on the static SceneManager.Instance
2012-11-24 02:57:43 +00:00
82690e1384
Fix bug where loading an OAR with a deeded parcel would always set the parcel owner ID to the estate owner even if the group UUID was present.
...
Aims to address http://opensimulator.org/mantis/view.php?id=6355
As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records
(i.e. no membership data etc)
This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
2012-11-24 02:43:31 +00:00
cda531bc3c
minor: Add some currently commented out debug log lines for investigating issues resolving group IDs for land parcels on OAR loading where groups do not exist
2012-11-23 05:44:31 +00:00
999cb4b20c
Make "show threads" and "thread abort" console commands available on all servers
2012-11-23 04:40:49 +00:00
e0a3e01850
Make "force gc" console command available across all servers
2012-11-23 04:27:04 +00:00
4b46a0d536
Make "show version" console command available across all servers
2012-11-23 04:19:08 +00:00
065d6d6fe1
Delete unused BaseHttpServer.HandleAgentRequest()
2012-11-23 04:15:21 +00:00
acc1810af2
minor: remove some mono compiler warnings
2012-11-23 04:08:17 +00:00
1f336579c8
minor: Make note in log if scene was restarted due to an unrecoverable physics error
2012-11-23 04:06:48 +00:00
f473252fa8
Add AllowRegionRestartFromClient setting to [EstateManagement] section of OpenSim.ini.
...
Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate.
One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules,
though these should be fixed as soon as practicable.
Default is true, as has been the case historically.
2012-11-23 03:56:53 +00:00
01f06b90dd
Merge branch 'careminster' into avination
2012-11-23 03:42:04 +00:00
ae8733bf59
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-23 03:39:49 +00:00
36c6edac69
Remove the redundant BypassPermissions() checks in EstateManagmentModule.
...
This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
2012-11-23 03:29:50 +00:00
9b60c14bb1
minor: Add some console feedback on region restart and log who requested a region restart if done from the viewer.
2012-11-23 03:05:30 +00:00
edb3a9596b
Remove a superfluous newline from help
2012-11-23 03:31:44 +01:00
8c8c8a00a4
Fix problem where restarting the currently selected region would stop various console commands (e.g. "show users") from working.
...
This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
2012-11-23 02:22:30 +00:00
6581097001
Fix new command console code to match the output of the original while keeping
...
the new features
2012-11-23 03:20:15 +01:00
c96729b55d
Add a newline before the constant help text
2012-11-23 02:06:05 +00:00
049987925d
Add regression test for checking scene close when SceneManager is asked to close
2012-11-23 02:05:30 +00:00
2e7b72d3da
Revert help to display a full command list. Leave the help categories in as
...
"help categories" in case it turns out useful in the future. May not work.
2012-11-23 02:04:24 +00:00
b09fb01571
Fix a build break introduced by us having a more efficient DoubleDictionary
...
where core has a simple list
2012-11-23 02:03:44 +00:00
eb1921ff93
Add "help all" console command which will list all commands alphabetically in a single list
2012-11-23 01:52:48 +00:00
2abddedc34
Merge branch 'master' into careminster
2012-11-23 01:49:25 +00:00
442896cb1d
Remove duplicate registration of the help topics for the module commander
2012-11-23 02:44:51 +01:00
c2e89334b8
Merge branch 'master' into careminster
2012-11-23 01:44:35 +00:00
61808d148e
Fix regression where we stopped closing scenes on simulator exit.
...
If we don't do this, then these scenes don't get deregistered from the grid, amongst other things.
Regression was introduced in commit 8c130bc
2012-11-23 01:01:39 +00:00
2bdd3eb918
Merge branch 'master' into careminster
2012-11-22 14:47:57 +00:00
3b2caa63b0
Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it
...
conflicts with PhysicsShape type defined in later libOMV
2012-11-22 14:45:41 +00:00
3c1a58c67a
Merge branch 'master' into careminster
2012-11-22 13:37:27 +00:00
c3e1701d43
Merge branch 'avination' into careminster
2012-11-22 13:33:34 +00:00
98b0cb8df8
* While this is not producing any problems.. and does help in low bandwidth situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet.
2012-11-22 08:13:35 -05:00
3ce00e97cc
Factor out command script code.
...
This also allows comments in command scripts (lines starting with ;, # or //) to be used across all servers
2012-11-22 05:57:20 +00:00
9fcf3f1a3f
Make "config show/set/get/save" console commands available on all servers
2012-11-22 05:48:41 +00:00
8269d2b893
Factor out common pid file creation and removal code.
...
Log path at which pid file is created or reason for failure to create.
2012-11-22 05:14:43 +00:00
42e87a6582
Add "get log level" command - this returns the current server session console logging level.
...
This supersedes getting information by calling "set log level" without a 4th argument, which is confusing.
2012-11-22 04:57:45 +00:00
34ff96a119
Remove unused BaseOpenSimServer.ShowHelp()
2012-11-22 04:52:29 +00:00
4c4379b50f
Make "set log level" command available across all servers
2012-11-22 04:50:09 +00:00
45d1e6ab09
Make "show info" command available across all servers
...
This helpfully lists version information, startup location and console log level
2012-11-22 04:45:53 +00:00
cf03d6ea92
Factor out common registration of "show uptime" command
2012-11-22 04:11:03 +00:00
5c48d7a378
factor out common HandleShow code for "show uptime"
2012-11-22 04:05:09 +00:00
74a20a62ee
refactor: Factor out copy/pasted server uptime report code
2012-11-22 03:43:21 +00:00
5f4ac1c5a3
Merge branch 'master' into careminster
2012-11-22 03:40:30 +00:00
c4c6121752
Merge branch 'master' into careminster
2012-11-22 03:17:33 +00:00
448811ccdd
If an asset POST does not contain well-formed XML, return a 400 (Bad Request) HTTP status rather than simply dropping the request.
2012-11-22 03:03:37 +00:00
33a4f07c4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-22 03:01:26 +00:00
cbc7e7bf85
BulletSim: Make avatar capsule so it is not circular.
...
Simple attempt to make avatars better shaped.
Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth'
and 'avatarCapsuleDepth'.
More tweeking to avatar height calculation. A little better but
short avatar's feet are above the terrain and tall avatar's feet
are a little below the ground.
2012-11-21 16:43:53 -08:00
4a0de01704
BulletSim: Properly position mesh terrain on creation (fixes terrain not appearing to be working). Centralize terrain shape creation logic. Remove very chatty detail log messages.
2012-11-21 16:43:45 -08:00
a59368c4a1
BulletSim: add terrainImplementation parameter with default to Mesh.
2012-11-21 16:43:37 -08:00
2dc7e9d3fa
BulletSim: fix line endings to be all Linux style (windows style keeps creeping in)
2012-11-21 16:43:29 -08:00
34cbc738a8
BulletSim: enablement and debugging of mesh terrain.
2012-11-21 16:43:21 -08:00
71b9640dfa
BulletSim: pull heightmap implementation out of the terrain manager so a mesh terrain can be implemented.
2012-11-21 16:43:14 -08:00
8dd5813889
BulletSim: rename SHAPE_AVATAR to SHAPE_CAPSULE with the eye to eventually having mesh avatars.
2012-11-21 16:43:06 -08:00
65e55ada87
BulletSim: uplevel FixedShapeKey out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to same.
2012-11-21 16:42:58 -08:00
d6db0d5740
BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since it is getting simplified out of existance someday) and update all the references to that enum.
2012-11-21 16:42:50 -08:00
4d29488216
BulletSim: change PositionSanityCheck to apply a force to correct position corrections (below ground and floating).
2012-11-21 16:42:42 -08:00
2f5fe4b88e
BulletSim: tweek avatar capsule parameters so avatar feet don't go below ground. This solves the bouncing, short avatar problem (Mantis 6403).
2012-11-21 16:42:34 -08:00
bac8ac32da
Add regression test for a good request made to the asset service post handler.
...
Adds new OpenSim.Server.Handlers.Tests.dll to test suite
2012-11-21 23:42:34 +00:00
45eedb635a
Merge branch 'master' into careminster
2012-11-20 20:25:15 +00:00
f656adee31
If GetAgents() is called with an empty userIDs array then don't bother with a useless potentially network call on the scene presence service connector.
...
This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument"
which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens.
2012-11-20 10:22:49 +00:00
ea65a64f7b
refactor: Move common presence connector code into BasePresenceServiceConnector
2012-11-20 10:11:57 +00:00
597a101b9f
Minor formatting for 0962a35d and a few one-line comments as to why that code is there
2012-11-20 05:09:44 +00:00
0962a35d2f
Fix movetotarget on mega regions.
2012-11-20 04:54:13 +00:00
dc5711ad62
minor: If logging full incoming HTTP data, don't deceptively print ... at the end of the body.
2012-11-20 04:10:03 +00:00
decc5318a7
Merge branch 'avination' into careminster
2012-11-20 01:21:15 +00:00
ccc81183b0
Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
2012-11-20 01:20:59 +00:00
0bf66434bc
Merge branch 'teravuswork' into avination
2012-11-20 00:48:13 +01:00
9f2d232c71
Merge branch 'master' into careminster
2012-11-19 22:53:03 +00:00
6c961d8add
BulletSim: Use base class constructors for initialization of BSShape and other classes.
2012-11-18 22:58:36 -08:00
22be36be69
BulletSim: fix the problem with flying being disabled when crossing region boundries.
2012-11-18 22:57:26 -08:00
079a1e704f
BulletSim: remove the obsolete interface to the Bullet code. Update BulletSim libraries with code stripped of the obsolete code.
2012-11-18 18:17:30 -08:00
5e0294815f
* Plumbing and basic setting of the GetMesh Cap Throttler.
...
* Last step is to flip the throttle distribution.
2012-11-17 03:47:09 -05:00
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
e4659a83f1
Merge branch 'master' into careminster
2012-11-17 02:03:24 +00:00
5b79bfc4df
Remove old InventoryService, which has for a long time been replaced by XInventoryService.
2012-11-17 01:32:01 +00:00
6faa7fc7f9
Prevent a buffer overflow in asset receiving
2012-11-17 02:31:56 +01:00
392e84e554
Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuid
...
This was necessary historically but hasn't been for many years.
Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
2012-11-17 01:23:29 +00:00
2aa58c5843
Do not allow invariants to change on calls to XInventoryService.UpdateItem()
...
This is to help track down http://opensimulator.org/mantis/view.php?id=6359 where creator IDs on items and rezzed objects have been reported to sometimes change.
This should never happen - a particular item should never change creators (if an item is given then a new item (with new id) is created).
Invariants are inventory type, asset type, folder (changed only on MoveItems()), CreatorIdentification and Owner.
If caller attempts to change an invariant, warning is logged but other properties are still changed.
If you see this warning, reporting on Mantis 6359 would be very welcome with the exact operation being done at the time.
2012-11-17 01:01:14 +00:00
e25c51330a
Add basic XInventoryServicesTests.TestAddItem() regression test.
2012-11-17 00:12:25 +00:00
55f889cc66
refactor: Move stat classes out of StatManager and into their own files for clarity.
2012-11-16 05:02:06 +00:00
cbc635a9c6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-16 04:48:55 +00:00
cd088757e9
Add a first draft mechanism for the IncomingPacketsProcessedStat to show the delta over time.
...
The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling.
2012-11-16 04:36:22 +00:00
e9153e1d1a
Revert "Merge master into teravuswork", it should have been avination, not master.
...
This reverts commit dfac269032619c39e514
2012-11-15 10:05:16 -05:00
dfac269032
Merge master into teravuswork
2012-11-15 09:46:41 -05:00
619c39e514
* Fixes mesh loading issues in last commit.
2012-11-15 09:44:02 -05:00
df62d113ab
The last few AssemblyInfos. Finished!
2012-11-14 21:18:18 -08:00
350cd58e5e
refactor: move common inventory folder version update code to parent class in mysql, mssql and sqlite database plugins
2012-11-15 04:01:30 +00:00
5895c4cc6f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-11-15 03:46:10 +00:00
16dd94b956
Improve inventory folder version updating for mssql database plugin.
...
I am not in a position to test this so the updates have been done blind.
If it needs any fixing will probably require patches.
2012-11-15 03:39:17 +00:00
1aa0271239
Implement folder version updating for the sqlite inventory plugin
2012-11-15 03:29:55 +00:00
daf03bfb56
Handle Map block requests on a separate thread rather than the main packet handling thread.
...
This prevents a slow grid information network call from holding up the main packet handling thread.
There's no obvious race condition reason for not doing this asynchronously.
2012-11-15 03:09:20 +00:00
57273ef7b2
Do HandleMapLayerRequest on its own thread rather than on the main inbound udp packet handling thread.
...
There's no obvious race condition reason for doing this on the main packet handling thread.
2012-11-15 03:07:45 +00:00
df4da51f04
Following on from 4f982596, launch map name requests on an async thread from LLClientView directly.
...
This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
2012-11-15 03:04:46 +00:00
038528dc80
Make PacketPool class stats pull stats instead of push stats so they can be lifted up into LLUDPServer and be distiguished by scene name
2012-11-15 02:02:59 +00:00
2c36106675
Add IncomingPacketsProcessedCount stat for diagnostics.
...
Also puts some packet processing counts in a container named after the scene so that stats can be collected from more than one scene.
2012-11-15 01:14:18 +00:00
06fa1681ae
Merge branch 'master' into careminster
2012-11-15 00:43:26 +00:00
35fd4474b2
Added AssemblyInfos in the OpenSim.Server namespace dlls.
2012-11-14 11:20:55 -08:00
aeeaa3a0a9
Added AssemblyInfos to every dll in the OpenSim.Region namespace.
2012-11-14 11:09:43 -08:00
27b12cebbb
A few more AssemblyInfos in a few more dlls.
2012-11-14 08:10:15 -08:00
fcaddd901c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-14 07:50:58 -08:00
c88e6fb445
Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset service)
2012-11-14 07:50:19 -08:00
94da908813
More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possible.
...
Not doing SQLiteInventoryStore since this is no longer used and should disappear in the future.
2012-11-14 04:45:59 +00:00
2ccb53b42d
If no ISimulationDataStore or IEstateDataStore implementations could be loaded then halt with informative message rather than a later NRE.
...
Halt already occurs if the relevant config sections are not present.
So it also makes sense to halt if the implementations themselves cannot be loaded.
2012-11-14 04:17:39 +00:00
790b595aa0
Added a few more AssemblyInfos. (Plus added the one in OptionalModules, which had been forgotten.)
2012-11-13 19:50:19 -08:00
e4cb7af98a
Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file.
2012-11-13 19:26:43 -08:00
1f9d39c15d
Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll.
2012-11-13 09:54:52 -08:00
18c5d33f0a
All optional modules' directives moved out of addin.xml
2012-11-13 09:48:56 -08:00
556d70feef
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2012-11-13 17:37:39 +00:00
89a1388857
Deleted .addin.xml. Added AssemblyInfo.cs
2012-11-13 09:04:32 -08:00
922425a205
Last 27 modules' directives (service connectors out).
2012-11-13 08:49:52 -08:00
457395d9c1
Another 11 modules' directions moved out of .addin.xml
2012-11-13 08:36:44 -08:00
608444c9f7
Another 21 modules' directives moved out of .addin.xml
2012-11-13 08:27:51 -08:00
af01a2320a
Merge branch 'master' into careminster
2012-11-13 10:49:24 +00:00
d73aa8c1a6
Moved the WindModule and its own plugins out of .addin.xml
2012-11-12 21:27:23 -08:00
99ccd4ea44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-12 21:15:35 -08:00
31177d9259
Another 10 modules' directives moved from .addin.xml
2012-11-12 21:14:58 -08:00
2fd36653b9
minor: Add some explanative method doc to SceneHelpers.SetupSceneModules()
2012-11-13 04:34:03 +00:00
f605a62427
Disable code to get server-side to move given items to a destination folder on TaskInventoryAccepted.
...
This is because the fixes to inventory versioning (so that they better match viewer expections)
now appear to allow the viewer to execute #RLV moves, as happens on the LL grid.
Doing it again server-side now wrongly creates another child #RLV folder underneath the root one.
As per http://opensimulator.org/mantis/view.php?id=6311
2012-11-13 04:15:21 +00:00
29bfd9e46c
Merge branch 'master' into careminster
2012-11-13 02:28:40 +00:00
48577af325
More module cleanup: removed the CoreModules.Framework modules directives out of .addin.xml.
2012-11-12 18:23:20 -08:00
9a5679876e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
2012-11-13 02:10:09 +00:00
335ff4359c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-12 18:08:27 -08:00
86903f23dd
Cleanup on region modules: gave short node id's to all of them.
2012-11-12 18:08:02 -08:00
3398999149
Merge branch 'master' into careminster
2012-11-13 01:57:11 +00:00
40d5148bbc
Update ScriptModuleComms name space to CoreModules
2012-11-13 01:56:32 +00:00
2e0ce70e63
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/ModuleLoader.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-12 23:27:47 +00:00
4edaa4e41a
Completely remove the IRegionModule interface
2012-11-12 22:56:59 +00:00
faca755995
Stop closing old style modules
2012-11-12 22:51:24 +00:00
8c130bcaf5
Remove the old style module loader and all references to it
2012-11-12 22:50:28 +00:00
e41374dd01
Remove IRegionModule support from the test setup helper
2012-11-12 22:25:35 +00:00
0d15a6a01f
Remove any mention of IRegionModule from region names and comments to aid
...
grepping for remaining uses
2012-11-12 19:18:20 +00:00
d9b149b375
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-11-12 15:46:45 +00:00
152d5dc2a7
Fix mantis #6425
2012-11-11 21:13:14 -08:00
db418bff2b
Fix issues with the DynamicTextureModule and corresponding unit tests.
2012-11-11 19:39:21 -08:00
113a9704f2
One more module converted: WebStatsModule.
2012-11-11 17:02:22 -08:00
64fad2f80e
Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule.
2012-11-11 16:44:59 -08:00
4e8c8b2cd8
One more module converted: MRMModule.
2012-11-11 16:18:47 -08:00
abef034d1b
One more module converted: IRCStackModule.
2012-11-11 16:10:47 -08:00
ba2318bd61
One more module converted: PermissionsModule.
2012-11-11 15:59:09 -08:00
571f6a0300
One more module converted: XMLRPCModule. Removed it from the special loading at start.
2012-11-11 15:29:25 -08:00
4de8915ddd
One more module converted: VectorRenderModule.
2012-11-11 15:04:02 -08:00
9f45198516
One more module: DynamicTextureModule. Removed it from the special load in the beginning.
2012-11-11 14:54:40 -08:00
6759ed1013
One more module converted: LoadImageURLModule. Also removed it from its hard-coded instantiation (I think I understood what the problem was, and that I've done it right).
2012-11-11 14:46:22 -08:00
963b1e861c
One more module converted: ScriptsHttpRequests.
2012-11-11 14:22:06 -08:00
84be90e5f8
One more module converted: EmailModule.
2012-11-11 14:00:58 -08:00
f560d581bb
document & 80-character width terminal formatting
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
23605cf93d
converting NPC module to ISharedRegionModule
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
c60e1a1ae6
J2KDecoderModule: move the code out of PostInitialise()
2012-11-11 13:49:07 -08:00
d84de8c9b6
Merge branch 'master' into careminster
2012-11-11 21:16:58 +00:00
3c48b44b68
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-11-11 21:16:29 +00:00
b9f602cc77
Prevent datasnapshot from crashing the simulator
2012-11-11 21:16:07 +00:00
1a478f868e
Prevent datasnapshot from crashing the simulator
2012-11-11 21:15:39 +00:00
37c9700904
moving windlight-sources to correct namespace-named folder (world); add LightShare as Interface
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 11:17:40 -08:00
6cf90e5516
One more module converted: LightShareModule.
2012-11-11 08:38:39 -08:00
389077345f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2012-11-11 16:31:01 +00:00
d589a8bc04
Deleted 2 obsolete modules: OGSRadmin and OpenGridProtocol. They were still IRegionModule's and they have been dead for a very long time, so no need to drag them along in this revamping of region modules.
2012-11-11 08:14:58 -08:00
f85d054bc6
One more module converted: MonitorModule.
2012-11-11 07:46:12 -08:00
79d51c27bb
One more module converted: InventoryArchiverModule.
2012-11-11 07:31:25 -08:00
09deaa890d
One more module converted: GroupsModule.
2012-11-10 17:56:25 -08:00
2ef0062664
One more module converted: XferModule.
2012-11-10 17:48:04 -08:00
562c585bc6
One more module converted: GodsModule.
2012-11-10 17:34:42 -08:00
cdcb67a952
One more module converted: GesturesModule.
2012-11-10 17:21:09 -08:00
d5f9f5c9c3
document, 80-character width terminal formatting converting comments to documentation for IDE & doxygen goodness
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-10 17:09:47 -08:00
b3dddd7447
document & 80-character width terminal formatting
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-10 17:09:47 -08:00
a87c4c7d89
Converting WorldCommModule to INonSharedRegionModule
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-10 17:09:46 -08:00
fe2fa70c74
One more module converted: Combat/CombatModule.
2012-11-10 16:42:52 -08:00
74dd38db70
One more module converted: AvatarFactoryModule.
2012-11-10 16:24:15 -08:00
5fb5758103
Cleaning up some confusion with Addin names introduced in a prior commit. Also the Flotsam cache module was being given a different Addin name, I removed that.
2012-11-10 15:54:11 -08:00
e10d61ea8c
One more module converted: CloudModule.
2012-11-10 11:59:08 -08:00
b3574d23e4
One more module converted: DataSnapshot.
2012-11-10 11:26:03 -08:00
3a5e317f65
One more module converted: ObjectAdd.
2012-11-10 10:35:27 -08:00
26a94610fc
Fix Unit tests -- the module contract was not being honored in the set up of scenes.
2012-11-10 10:21:37 -08:00
4ac857f902
One more module: EventQueueGetModule. Also making it non-optional for this dll.
2012-11-10 08:48:31 -08:00
fb7bbe167a
formatting DialogModule for 80-character width terminal
2012-11-10 08:12:31 -08:00
5cba04e2d6
Converting DialogModule to INonSharedRegionModule
2012-11-10 08:12:31 -08:00
d0742cea3e
80 character-width terminal formatting of IDialogModule interface, removing superfluous whitespace & line-endings.
2012-11-10 08:12:30 -08:00
ee3d06220e
Documenting parameters of methods on the IDialogModule interface
2012-11-10 08:12:30 -08:00
791c4d5b9f
One more module converted: J2KDecoderModule.
2012-11-10 08:10:43 -08:00
86b22604fa
One more more converted: IPBanModule.
2012-11-09 22:21:11 -08:00
a4fee98352
One more module converted: TreePopulator.
2012-11-09 22:09:08 -08:00
bbff036944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-09 21:59:01 -08:00
492515cf3f
One more module converted: Vegetation.
2012-11-09 21:58:39 -08:00
12c62d30e1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-10 05:44:50 +00:00
c94240ba5b
Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() and make it compile again
...
Not currently in test suite since not yet working.
Also add method doc to Scene.DeRezObjects()
2012-11-10 05:43:57 +00:00
cda127e30f
* Prep work switching the GetMeshModule over to a poll service.
...
* This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
2012-11-09 23:55:30 -05:00
4f98259617
Minor improvement in the MapSearchModule. Stop blocking the client thread if the search takes too long.
2012-11-09 20:39:55 -08:00
2540132a54
MapSearchModule also converted to new region module interface (37 to go).
2012-11-09 16:40:55 -08:00
19aab3e6fe
Converted the WindModule to the new region module interface (38 to go). Also added both the WindModule and the SunModule to the Plugin manifest.
2012-11-09 16:28:30 -08:00
7dfd1468cc
Converted the SunModule to the new region module interface. (39 to go...)
2012-11-09 15:38:10 -08:00
415b89f434
Merge branch 'master' into careminster
2012-11-09 22:58:42 +00:00
64c80aec64
llSetLinkCamera implementation
...
wiki: http://wiki.secondlife.com/wiki/LlSetLinkCamera
mantis: http://opensimulator.org/mantis/view.php?id=6397
2012-11-09 14:31:56 -08:00
5bff741544
marking IRegionModule interface as obsolete via System.ObsoleteAttribute, intentionally triggering a bunch of warnings in compiler output in hopes of encouraging other developers to refactor built-in modules when they have free time.
2012-11-09 14:20:24 -08:00
61b816ebba
minor: Adjust method doc on IXInventoryData MoveItem() and MoveFolder() to make it clear we're moving to an existing folder.
2012-11-09 01:18:11 +00:00
75c880a6f3
Update parent inventory folder version numbers when folders are moved/created/deleted to match version numbers cached by viewers.
...
This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders).
This should hopefully improve viewer reuse of its cached inventory information.
Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
2012-11-09 01:13:19 +00:00
9bc0419679
ODECharacter overrides TargetVelocity. No change to existing behavior
2012-11-08 01:18:25 -08:00
b3e99a4d48
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
2012-11-08 04:51:00 +00:00
a407eb287f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-11-07 20:05:30 -08:00
eb273b808e
HG: Hopefully this fixes the issues with port 80 once and for all.
2012-11-07 19:59:54 -08:00
3666518319
BulletSim: add skeleton classes for shape objectification. This will eventually replace all the if's and switches in ShapeCollection with polymorphism.
2012-11-07 15:29:51 -08:00
67d5dbbb49
BulletSim: add classes for physics motors. Eventually these will replace the manual code for vehicles and add PID functionality to avatar movement.
2012-11-07 15:28:06 -08:00
ee00c5c885
BulletSim: many changes to tune vehicles for BulletSim.
...
The problem left is that the vehicle sitting on something needs
to press down for gravity and what its sitting on pushes up
so the vehicle does not penetrate. The effect is Bullet calculates
a lot of random angular motion for the vehicle. Various schemes
of damping and zeroing has not resolved the problem.
2012-11-06 18:16:47 -08:00
76cc303031
BulletSim: Add ZeroAngularMotion method to physical objects. Add inTaint flag to ZeroMotion method. Update the references to those functions.
2012-11-06 18:16:35 -08:00
e2130817e5
BulletSim: remove limit on taints that can happen before a step. Remove some debugging code (detail log flushing).
2012-11-06 18:16:23 -08:00
f70a3099b5
BulletSim: recalculate the compound shape bounding box when built.
2012-11-06 18:16:12 -08:00
702fd1e094
BulletSim: only compute linkset mass when membership changes rather than everytime someone asks for it.
2012-11-06 18:16:00 -08:00
36d77fe27c
BulletSim: Add separate linear and angular damping function calls. Add function for recalculating compound shape bounding box.
2012-11-06 18:15:48 -08:00
b2dfa6f022
To keep things consistent allowing an UnregisterModuleInterface... Force the GodModule to request the dialog module interface on a kickuser call and not to use the 'in memory cached one'. Thanks Ar3s for locating the offending inconsistency.
2012-11-06 19:03:41 -05:00
bf469819a6
Update folder version numbers when moving items and making the Delete(string[], string[]) call (not just string, string).
...
This is to stop viewer inventory cache version numbers becoming out of sync with grid stored numbers when viewer performs these actions.
If there are no problems with these changes, they will be propogated to SQLite (and MSSQL if that's simple enough).
May also need to do the same on folder store/create/delete and maybe propogate version increments up the folder hierarchy, but that requires investigation.
2012-11-06 23:44:52 +00:00
a8424490ae
Increment version number of a folder when an object it contains is deleted.
...
Not doing this was allowing the viewer inventory cache to become out of sync if an item was directly deleted.
2012-11-06 23:40:33 +00:00
5cbf7b3997
Merge branch 'ubitwork' into avination
2012-11-06 11:32:53 +01:00
182b487243
This implements the Caps throttler. After some testing, the system seemed to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference.
...
Tested with Two Clients on a region with 1800 textures all visible at once.
2012-11-05 22:05:10 -05:00
b7b96a5e4f
Another step in the chain. Pipe the throttle update to the appropriate PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator.
...
Next step is hooking it up to HasEvents
2012-11-05 13:10:00 -05:00
4fa088bafb
Pipe Throttle Update Event to EventManager, client --> ScenePresence --> EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
2012-11-04 22:57:24 -05:00
236cc1f268
Change user message on TeskInventoryAccepted to let the viewer format it
...
properly
2012-11-05 00:05:01 +00:00
006d70582b
Merge branch 'master' into careminster
2012-11-04 23:29:18 +00:00
08b37efc32
Prevent IMs being sent to prims when avies decline inventory offers from them.
2012-11-04 23:28:05 +00:00
89322aaf94
Prevent IMs being sent to prims when avies decline inventory offers from them.
2012-11-04 15:17:47 -08:00
c623e35805
Merge branch 'master' into careminster
2012-11-04 22:44:42 +00:00
f391d028de
Add a method to query all registered script constants to allow non-XEngine
...
script engines to use them.
2012-11-04 22:39:15 +00:00
dd416298f1
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-11-04 22:37:28 +00:00
7e91a787fb
Add a method to query all registered script constants to allow non-XEngine
...
script engines to use them.
2012-11-04 22:01:34 +01:00
4737839b3a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-11-04 16:00:41 +01:00
1090ff7278
removed potencial null refs and rearrange code a bit
2012-11-04 14:57:27 +00:00
79f7c466a1
BulletSim: fix compound linkset crash by not freeing shape of child prims.
...
Remove all compilation warnings (mostly 'protected' in sealed classes.)
Add the dynamicAabbEnable parameter to creation of compound shapes.
2012-11-03 21:16:02 -07:00
894bb4893b
BulletSim: search the mesh and hull lists to find shapes if type is not known. This makes sure the correct accounting is done for the particular shape.
2012-11-03 21:15:54 -07:00
498ea76e63
BulletSim: Move construction of compound linkset from ShapeCollection
...
into LinksetCompound where it should be.
Create meshes for native shapes when part of a compound linkset because
scale is currently per object and not per collision shape.
Don't schedule a LinksetCompound refresh if just changing properties.
2012-11-03 21:15:46 -07:00
1dc23b2b97
BulletSim: parameterize selection of linkset implementation
2012-11-03 21:15:39 -07:00
b0eccd5044
BulletSim: debugging of compound shape implementation of linksets.
...
Add compound shape creation and freeing in shape manager.
Add optional taint-time execution method and update code to use it.
Add API2 linkage for more compound shape methods (get num, get/remove by index, ...)
Modify perferred shape return so linkset children can have differet shapes than root.
Add Position and Orientation calls to linksets so children can be moved around by
the linkset by its own calculation. Allows for very general linkset implementations.
2012-11-03 21:15:30 -07:00
f53b4e7a21
BulletSim: Add RawPosition and RawOrientation to BSPhysObject and rename MassRaw to RawMass. Fix BSShapeCollection to use Raw* for creating the body to eliminate exception from referencing the physical body before it has been created.
2012-11-03 21:15:22 -07:00
39c02dcc8c
BulletSim: Remove use of shapeData in ShapeCollection and rely on the available BSPhysObject varaiables. Fix line endings in BSLinksetCompound.
2012-11-03 21:15:14 -07:00
364a7c3088
BulletSim: rename BSBody and BSShape to PhysBody and PhysShape. Add skeleton of BSLinksetCompound.
2012-11-03 21:15:06 -07:00
28e2cd3fa2
BulletSim: vehicle tweeking.
...
Add AddTorque() method to BSPrim. Remove some manual motor actions
in computing angular force (will eventually be replaced with motor class).
Remove some experimental changes.
2012-11-03 21:14:58 -07:00
52be581f71
BulletSim: remove center-of-mass setting for linksets because it causes the constraint calculation to pull the objects together.
2012-11-03 21:14:49 -07:00
93fe384cce
BulletSim: Use the PostTaints operation to build the linkset once before the next simulation step. This eliminates the management of children vs taintChildren and simplifies the constratin creation code.
2012-11-03 21:14:41 -07:00
42d65840c8
BulletSim: Add gravity force to vehicle. Some debugging additions.
2012-11-03 21:14:33 -07:00
dae038a117
BulletSim: fix problem with multiple linksets stepping on each other if they are built at the same time.
2012-11-03 21:14:25 -07:00
4cfa3be4ef
BulletSim: add definitions for linkset collision mask
2012-11-03 21:14:16 -07:00
bc43c7007d
BulletSim: code rearrangement
2012-11-03 21:14:08 -07:00
8c9e4c1f7b
BulletSim: Use Refresh/PostTaints to cause recomputing of constraint variables before the simulation step. Update logging and messages to properly name LinksetConstraints. Use UpdatePhysicalMassProperties to put the whole linkset mass into all the physical linkset members so they have the inertia to move the whole linkset.
2012-11-03 21:14:00 -07:00
9568f24c26
BulletSim: add post taint taints and post step taints. The post taints operation is most useful and is used by linksets to build and rebuild only once before the simulation step.
2012-11-03 21:13:52 -07:00
2f25f70316
BulletSim: remove unneeded parameter from Refresh().
2012-11-03 21:13:44 -07:00
e20bad12cc
BulletSim: centralize mass/inertia computation with UpdatePhysicalMassProperties() function. Didn't add setMassRaw because assignment with side effect is dirty.
2012-11-03 21:13:35 -07:00
7af28724ac
BulletSim: rename constraint classes so they show up together alphabetically.
2012-11-03 21:13:27 -07:00
92d3c611e5
BulletSim: many small changes for vehicles simulation.
2012-11-03 21:13:19 -07:00
2b75035aef
BulletSim: add ForEachMember(action) call for linkset.
2012-11-03 21:13:11 -07:00
8fa83cf430
BulletSim: Add activations after vehicle properties change. Problem was the vehicle was going to sleep while waiting for commands. Make AddAngularForce work the same way as AddForce -- accumulates values and pushes them once into Bullet.
2012-11-03 21:13:03 -07:00
b83449ae9a
BulletSim: correct spelling of Bullet call. It's 'swept' not 'sweep'.
2012-11-03 21:12:54 -07:00
804b332d45
BulletSim: Add banking and other new code to vechile dynamics. Add third party license and contributor in for for Aurora-Sim project for physics code.
2012-11-03 21:12:46 -07:00
9eb39406ad
Prevent a null client from crashing windlight.
2012-11-03 20:35:09 +01:00
783443705d
HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder with parentID=UUID.Zero
2012-11-03 12:03:47 -07:00
d0473b73da
Merge branch 'master' into careminster
2012-11-03 15:38:47 +00:00
b30ae054dd
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-11-02 18:51:50 +01:00
e642b80a79
actually remove the use of random on persist timmings
2012-11-02 17:49:54 +00:00
b8c19fe1a9
Create a new random when needed using normal time based seed instead of
...
reusing a shared one than may not be valid
2012-11-02 17:40:17 +00:00
fd2bee8da1
Squash reporting HelloNeighbor exception - it simply means the other sim
...
is down, no need for yellow ink.
2012-11-02 16:43:38 +01:00
7412795a0b
HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE.
2012-11-02 08:05:56 -07:00
458e00e204
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-11-02 15:05:26 +01:00
e36a700eb0
add debug position on bad primmesh error
2012-11-02 14:02:57 +00:00
4565f05301
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-11-02 11:21:25 +01:00
c2639bef8e
lock unique and uniqueReleased in same order when both locks are needed
2012-11-02 10:14:08 +00:00
2e106cd5de
Change to earlier commit for TargetVelocity to support distributed physics.
2012-11-02 03:09:04 -07:00
d383bcc0dc
Merge branch 'ubitwork' into avination
2012-11-02 10:59:04 +01:00
ce7beb6f20
Add [AssetService] AllowRemoteDeleteAllTypes (default false).
...
This allows a closed grid to delete asset types other than maptile remotely.
Only operational if AllowRemoteDelete = true also.
Defaults to false - do not enable if anybody other than you can make asset service requests.
2012-11-02 01:41:38 +00:00
462ad336dc
Move check to allow only deletion of maptiles up to AssetServerDeleteHandler from AssetService.
...
This allows us to use a common check for both AssetService and XAssetService.
It also allows future console commands to delete an asset.
As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
2012-11-02 00:02:10 +00:00
cbe43c15ec
Merge branch 'ubitwork' into avination
2012-11-01 22:25:29 +01:00
e7a6328ea4
Merge branch 'master' into careminster
2012-11-01 15:52:32 +00:00
8dfe59d7b8
Comment out checks not to overwrite existing IAR/OAR files for now on "save iar/oar" since this causes problems for some backup systems.
...
Needs more thought, maybe an explicit --force/--overwrite switch
Comments on http://opensimulator.org/mantis/view.php?id=6389
2012-11-01 03:42:15 +00:00
ffe4d738fb
Add TargetVelocity to PhysicsActor interface to support distributed physics. No change to existing functions.
2012-10-31 17:13:18 -07:00
a2c6094324
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-10-31 21:42:06 +00:00
566aaef1f4
Also add the additional ScriptException constructor necessary to get [Serializable] to work.
2012-10-31 00:56:41 +00:00
b3072cf343
Mark ScriptException as [Serializable] for when it has to cross AppDomains
2012-10-31 00:46:07 +00:00
4ba48151b2
Handle UUIDGroupName and ObjectGroup viewer UDP requests asynchronously rather than synchronously.
...
This is to avoid the entire scene loop being held up when the group service is slow to respond.
There's no obvious reason for these queries to be sync rather than async.
2012-10-31 00:39:45 +00:00
6235d16c31
Make "show object part" command correctly display script status.
...
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
2012-10-31 00:31:18 +00:00
28a4ea73ea
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/ChildAgentDataUpdate.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-10-31 00:13:33 +00:00
3388534ff5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-10-30 23:14:06 +00:00
fd9cb3cb68
Store and send the current movement animation state to a new sim on crossing
2012-10-30 23:08:22 +00:00
9e05067a4f
Add AnimState to CADU
2012-10-30 22:11:02 +00:00
ff61d59e60
Add AnimState to CADU
2012-10-30 21:45:39 +01:00
5328808b18
Make sure we're not accessing a physics scene if we're not in one yet.
2012-10-30 21:19:00 +01:00
e6c8eca504
Merge branch 'avination' into ubitwork
2012-10-30 19:42:32 +00:00
984faf24df
Only create a new list to check if objects have reached targets if there actually are any targets.
2012-10-30 01:48:05 +00:00
ff6c69000e
Log warning if mesh/sculpt asset couldn't be found by ODEPrim.MeshAssetReceived() callback.
...
Presumably this is now more useful if the false positive from the old method of loading mesh assets have been eliminated.
2012-10-30 01:40:59 +00:00
4eaa64d863
Merge branch 'avination' into careminster
2012-10-30 01:29:51 +00:00
d15d71a7ef
Put back the collision sound shim into SOP
2012-10-30 01:28:03 +00:00
9bc4dc6c5f
Add method doc to IAssetService.Get(string, object, AssetRetrieved) outlining the situations in which AssetRetrieved may be called back with a null AssetBase.
...
These situations include asset not found and remote service not responding.
2012-10-30 01:19:32 +00:00
cccf695327
Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing exception.
...
In some cases (such as failure to receive response from asset service), it is possible for a null to be returned from IAssetService.Get(string, object, AssetRetrieved).
2012-10-30 01:14:48 +00:00
37de965233
Make MeshAssetReceived private.
...
Keep methods private unless they need to be opened up to external callers. Reduces analysis complexity.
2012-10-30 01:08:00 +00:00
aeeed29d62
correct ODEPrim.MeshAssetReveived -> MeshAssetReceived
2012-10-30 01:07:14 +00:00
48569e856a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-30 01:02:20 +00:00
a09cba6da3
refactoring to use assembly:classname style of configuration
2012-10-29 23:39:01 +00:00
a16ddbee41
Renaming module back to SoundModule as the hypothetical plan was to make another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless.
2012-10-29 23:39:01 +00:00
e308841de9
SianaGearz notes stop sound flag is 1 << 5, so using that for ISoundModule.StopSound rather than setting gain to zero
2012-10-29 23:39:01 +00:00
e0b5a3cd90
tweaking configuration logic so that the INonSharedRegionModule will load by default
2012-10-29 23:39:01 +00:00
2bb0419251
documenting some params on ISoundModule methods
2012-10-29 23:39:01 +00:00
dcac2a7f71
refactoring llCollisionSound to use new KeyOrName method
2012-10-29 23:39:01 +00:00
a9999a9676
Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint
2012-10-29 23:39:01 +00:00
56965dd959
fixing poorly-formatted xml doc string for Util.IsInsideBox
2012-10-29 23:39:00 +00:00
ef15711089
refactoring llTriggerSoundLimited to not use the LSL methods, since that will cause unnecessary calls to m_host.AddScriptLPS(1)
2012-10-29 23:39:00 +00:00
af9dc483e9
refactoring llGetPos() to take advantage of implicit converter
2012-10-29 23:39:00 +00:00
f9923d4423
shifting from two instances of typecasting to one instance of typecasting in llTriggerSoundLimited
2012-10-29 23:39:00 +00:00
c796f7861e
80-character width terminal formatting of recent commits to llPlaySound, llPlaySoundSlave, llTriggerSound and llTriggerSoundLimited
2012-10-29 23:39:00 +00:00
c5af16aef8
shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string
2012-10-29 23:39:00 +00:00
5abcecc735
moving SendSound from SceneObjectPart to ISoundModule
2012-10-29 23:39:00 +00:00
af39af1cc4
fixing a bug in SceneObjectPart.SendSound where sounds would always come from the root prim rather than the source prim
2012-10-29 23:39:00 +00:00
57940087d1
Factoring out a superfluous local variable & repeated assignment in SceneObjectPart.SendSound as linksets are only meant to have a single owner
2012-10-29 23:38:59 +00:00
e75596524a
Formatting SoundModuleNonShared.LoopSound, consistent indentation
2012-10-29 23:38:59 +00:00
9df510157e
deduplicating code into a single LoopSound method
2012-10-29 23:38:59 +00:00
22693304fb
removing superfluous lines from SceneObjectPart.SendSound
2012-10-29 23:38:59 +00:00
3d8f59aac3
refactoring StopSound into a private static method to skip repeating m_scene.TryGetSceneObjectPart
2012-10-29 23:38:59 +00:00
e5df8cafb8
Removing a locked iteration over SceneObjectGroup.LoopSoundSlavePrims as the SL Wiki spec does not state that slaves are set to match master values
2012-10-29 23:38:59 +00:00
d7ffcace8f
adjusting parameter order of PreloadSound to be more logical
2012-10-29 23:38:59 +00:00
29a8ae48b5
transposing LoopSoundMaster to Sound Module
2012-10-29 23:38:59 +00:00
a68e2fe169
transposing preload sound onto sound module
2012-10-29 23:38:58 +00:00
8763a637b5
transposing stop sound into sound module
2012-10-29 23:38:58 +00:00
206a694c6b
moving comment for llStopSound inside the method block prior to transposition to sound module
2012-10-29 23:38:58 +00:00
b9e0f1cd2b
documenting ISoundModule methods & fields
2012-10-29 23:38:58 +00:00
d4034271eb
formatting ISoundModule prior to documentation
2012-10-29 23:38:58 +00:00
1c618843b8
formatting changes to SceneObjectPart.SendSound; consistent indentation
2012-10-29 23:38:58 +00:00
32db725dd7
SceneObjectPart.SendSound can exit early if a sound module was not found.
2012-10-29 23:38:58 +00:00
f4fe8763ad
Changing the logic order in the TaskInventory iterator of ScenObjectPart.SendSound, since we can currently have non-unique object inventory names so we should check the asset type first.
2012-10-29 23:38:58 +00:00
b42cfe49a2
Replacing double-if block in SceneObjectPart.SendSound with Util.Clip
2012-10-29 23:38:57 +00:00
6440892788
TryGetScenePresence in TriggerSound is probably meant to be using the ownerID, not the objectID
2012-10-29 23:38:57 +00:00
516ee244b4
swapping GetSceneObjectPart for TryGetSceneObjectPart in PlayAttachedSound to imply why we're doing an early return.
2012-10-29 23:38:57 +00:00
1d47bcb6b6
stripping whitespace from ISoundModule, formatting SoundModuleNonShared.cs
2012-10-29 23:38:57 +00:00
20be6a4b48
refactoring thisSpGain in PlayAttachedSound as it was previously using two typecasts in the assignment and had the assignment on a separate line to the declaration
2012-10-29 23:38:57 +00:00
6bd1f0f209
Factoring out an if-else block in PlayAttachedSound as it was using the previously hard-coded max distance value.
2012-10-29 23:38:57 +00:00
375fb66589
making the max distance for sounds to be heard from their origin a configurable option exposed via a public field on ISoundModule (with private setter in the implementation)
2012-10-29 23:38:57 +00:00
ed162a10be
Converting the ISoundModule implementation from an IRegionModule to an INonSharedRegionModule
2012-10-29 23:38:57 +00:00
7560010f34
Immediately setting gain to zero as a workaround for code not stopping sound started by llPlaySound
2012-10-29 23:38:56 +00:00
09f4e72d6a
Fix memory leak where removing an NPC did not remove its circuits.
...
This was because we were removing by circuitcode where NPCs have no code.
Now removing by agent ID instead.
This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
2012-10-29 23:22:40 +00:00
5681e812a5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-29 23:19:06 +00:00
c97890ca69
Add "force gc" region console command which manually invokes garbage collection.
...
For debugging purposes.
2012-10-29 22:53:06 +00:00
5b0fc60296
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
2012-10-28 18:58:43 +00:00
502efdb894
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-28 18:43:28 +00:00
5a96ef52cb
Deep copy the collection of at_target objects so it can't be modified while
...
it's being iterated
2012-10-28 18:41:47 +00:00
dc2c198e5d
Set the script state to new rez when a scriptis saved, rather than region start.
...
Prevents CHANGED_REGION_RESTART being sent to scripts when saving.
2012-10-28 19:09:14 +01:00
1a34f42426
Add a property to determine if a link set is stored in the database. Also, fix
...
a bug where "Force object permissive" god action would fail to reset child prim
permissions.
2012-10-28 18:34:57 +01:00
0d00b97aec
Deep copy the collection of at_target objects so it can't be modified while
...
it's being iterated
2012-10-28 18:45:16 +00:00
707fa2bdb9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 15:42:51 +01:00
db7f4074b5
revert last change
2012-10-28 14:39:04 +00:00
1bcecdaf30
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 15:34:54 +01:00
fbe4ec8ee0
fix ode timing
2012-10-28 14:32:55 +00:00
c513a3db59
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 15:05:39 +01:00
dd0323d89e
minor change
2012-10-28 14:04:39 +00:00
42479590f0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 12:56:09 +01:00
8bb2905416
test limit ode exec time by time not number of loops done
2012-10-28 11:55:11 +00:00
e0510203f9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 11:26:31 +01:00
ad7f273d95
more debug
2012-10-28 10:25:58 +00:00
3aff65e9a6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 10:58:58 +01:00
e297e90bda
remove pre physics build testing
2012-10-28 09:57:41 +00:00
3ac8461d3f
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 10:54:40 +01:00
aa97014ee4
Add some extra debug on scene close
2012-10-28 09:51:27 +00:00
42cd27c46a
Merge branch 'master' into careminster
2012-10-28 00:30:55 +01:00
3531f29a6a
minor: Fix verbose IAR save message to make it a bit clearer that item data is being saved at that point, not asset data.
2012-10-27 00:24:25 +01:00
cc204497e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-26 23:10:52 +01:00
67432fcbf2
Fix "save iar" hanging permanently if the asset request phase times out.
...
Unlike "save oar", this was happening on the same thread as the original request.
The timeout happens on another so the original thread is never aborted.
On "save oar" this leaves the thread hanging (still bad) but on "save iar" it left the console thread hanging.
Temporary fix is to make "save iar" do asset request on a separate thread, like "save oar".
Longer term fix will be to restructure asset save to use a ManualResetEvent rather than a separate timeout timer.
2012-10-26 23:08:59 +01:00
f3f794a122
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-26 21:47:41 +01:00
1c5f6e48b8
Separate LSL's notion of the default anim from the actually playing anims.
2012-10-26 21:23:20 +01:00
de6f147d3c
Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is"
...
This reverts commit fa484c3494
2012-10-26 21:16:27 +01:00
26cc57b6ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
16809bd0ea
minor: Make the error thrown logged when a simulator in grid mode is trying to set estate owner to a user that doesn't exist a little more obvious.
2012-10-26 02:36:58 +01:00
80dcc13af2
refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field with a private setter
2012-10-26 02:08:00 +01:00
e977761071
adding ability for listeners to be filtered by regular expressions and a general-purpose function to see if a given string matches a given regex
2012-10-26 02:08:00 +01:00
18b1ee6f37
Formatting and casing correction in WorldCommModule, trailing new line in OSSL to get git diff to not complain
2012-10-26 02:08:00 +01:00
1b3b7a61ac
minor: Add comment as to why we are pulcking plain old ints out of the LSL_List when converting values from LSL for modInvoke()
2012-10-26 01:50:46 +01:00
ecdb88679e
Removing the apparently superfluous explicit namespace reference so that the if-else-if-else block in ConvertFromLSL can have a consistent appearance
2012-10-26 01:43:54 +01:00
01972cc9e8
system ints can end up in LSL lists, which can cause counter-intuitive unknown list element type errors in ConvertFromLSL (via modInvoke)
2012-10-26 01:43:53 +01:00
2fb89b5aac
Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations since the call itself does nothing and the return value is ignored by all callers.
...
This is a very old method (+4 years) so is probably confusing code cruft.
2012-10-26 01:15:16 +01:00
85c909c0b5
Fixed saving non-square multi-region OARs
2012-10-26 00:06:44 +01:00
dc17cee044
minor: if a scene is already shutting down on Scene.Close(), warn and exit instead of attempting to run another shutdown concurrently.
...
Thanks to Oren Hurvitz for this change.
2012-10-25 23:47:55 +01:00
b4923da334
Changed "course" to "coarse" in several places
2012-10-25 23:32:37 +01:00
0482758e96
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-25 23:17:07 +01:00
22e216fd12
In Scene.Close(), dispose of the physics scene after base.Close() since script events can still access Physics scene until the script engine shuts down (triggered off base.Close())
...
XEngine listeners to EventManager.OnShutdown which is triggered from base.Close().
Possibly it could listen for the earlier OnSceneShuttingDown instead, but the easier solution right now is to relocate disposal of the physics scene.
This bug has existed since c150320
2012-10-25 22:55:29 +01:00
fa484c3494
Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is
...
loaded. Thank you tglion
2012-10-25 11:31:25 -07:00
c13a99dc5c
Fix script error messages not showing up in viewer 3 and associated viewers.
...
Viewer 3 will discard such a message if the chat message owner does not match the avatar.
We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages.
This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages.
This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
2012-10-25 03:26:12 +01:00
8af8319b95
Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if appearance notecard does not exist, rather than returning UUID.Zero or silently failing.
2012-10-25 03:02:00 +01:00
d9aaf51561
When scripts generate expected exceptions (e.g. due to checked bad parameter) throw ScriptException instead of just a plain old exception.
...
This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests.
No functional changes.
2012-10-25 02:52:20 +01:00
ae662b54ea
Make osNpcCreate() return UUID.Zero instead of throwing an exception if notecard name is invalid. Make osNpcLoadAppearance() fail silently in same circumstance rather than throwing exception.
2012-10-25 01:07:06 +01:00
5d4ac5a90f
Add TestOsNpcLoadAppearance()
2012-10-25 00:59:27 +01:00
1743fe5d62
Move npc creation tests involving appearance from OSSL_ApiAppearanceTest to OSSL_ApiNpcTests
...
This is a more intuitive location.
2012-10-25 00:29:50 +01:00
81aeecc907
Allow "show object", "show part", "dump object" and "delete object" to accept a local ID as well as a UUID.
...
This means that the sub-commands are now id rather than uuid, e.g. show object id
2012-10-24 04:10:22 +01:00
f76dceb90b
Get "save oar" and "save iar" to tell you in a more friendly manner if the filename to save already exists, rather than exception throwing.
...
Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
2012-10-24 03:08:58 +01:00
73db057fa1
Add "dump object uuid" console command. This allows any object in the scene to be serialized and dumped to XML for debug purposes.
2012-10-24 02:05:28 +01:00
326f1507fa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-24 02:04:26 +01:00
938fa96b9f
minor: Move co-ordinate related help to object commands to common ConsoleUtil.CoordHelp
2012-10-24 01:33:21 +01:00
b6fc5bad00
BulletSim: fix problem with avatars sinking into the ground.
...
Change terrain activation state to DISABLE_SIMULATION for better performance.
2012-10-23 17:30:43 -07:00
484eca323b
Merge branch 'master' into careminster
2012-10-23 17:25:40 +01:00
13cef0b16a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/LandData.cs
2012-10-23 17:23:36 +01:00
b49f8a377b
BulletSim: minor change to insure avatar body recreation when shape changes.
2012-10-23 08:02:26 -07:00
36bfd3667c
BulletSim: remove chatty debug message.
2012-10-22 22:25:06 -07:00
14eeb8b31b
BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh assets weren't already in the cache. Comment cleanups.
2012-10-22 22:24:59 -07:00
7272a4cae8
BulletSim: fix problem of not rebuilding shape by clearing last rebuild failed flag in BSPrim.ForceBodyShapeRebuild()
2012-10-22 22:24:51 -07:00
65c131c4a3
BulletSim: remove trailing spaces to make git happy.
2012-10-22 22:24:44 -07:00
c245178eee
BulletSim: encorporate UBit's suggestion to save a copy of mesh raw data.
2012-10-22 22:24:37 -07:00
a61f20ac74
BulletSim: Create LinkSet abstract class and sparate constraint based linksets into own subclass. Will eventually add manual movement linkset subclass.
2012-10-22 22:24:30 -07:00
319ebaca06
Make it possible to turn the base UDP object packet pools on and off whilst running via the "debug lludp pool <on|off>" console command. For debug purposes.
...
This does not currently apply to the higher LLUDP packetpool.
2012-10-23 02:44:15 +01:00
4578ff74fe
Add object count stats for new IncomingPacket and UDPPacketBuffer pools if they are enabled. Add count stats for existing LLUDP pool.
...
This introduces a pull stat type in addition to the push stat type.
A pull stat takes a method on construction which knows how to update the stat on request.
In this way, special interfaces for pull stat collection are not necessary.
2012-10-23 01:52:10 +01:00
2206132ab9
minor: Get content type handler logger to log "unset" for the content type instead of blank if no content type was set.
2012-10-23 00:44:47 +01:00
542d075376
minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data where this wasn't already used.
...
This allows log level 5 (log sample or large part of incoming post data) to operate and removes copy/paste.
2012-10-23 00:39:59 +01:00
efae7c6fc2
Refactor: Move Dwell reply to a module that can be disabled. The prior,
...
hardcoded approach disabled the use of non-core dwell tracking modules.
2012-10-21 21:12:34 +01:00
20eac8d6d0
SQLite DB: some values of land data will be not saved / loaded
...
http://opensimulator.org/mantis/view.php?id=6370
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-10-21 10:41:23 -04:00
3212bcff59
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-20 18:55:44 +02:00
3b51cae958
bug fix
2012-10-20 17:53:33 +01:00
07f1d44174
Merge branch 'master' into connector_plugin
2012-10-20 05:25:58 -04:00
d7fa4cacb3
Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (implementation of dwell-value in LandData + eventhandler, return always 0); source-formatting of LandData
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-10-20 05:06:46 -04:00
af9cd7d30c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-20 04:32:45 -04:00
2aac113ac1
Add CLICK_ACTION_ZOOM
...
Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction
2012-10-20 04:32:04 -04:00
5bc07a15f5
minor: remove unnecessary bit of method doc from OdePrim.BadMeshAssetCollideBits that monodevelop inserted automatically
2012-10-20 02:52:38 +01:00
d2b19f00da
Fix minor issues from commit 28483150
...
Fix spelling of collide, change to more self-documenting property BadMeshAssetCollideBits, add method doc, change to private to reduce code analysis complexity
2012-10-20 02:49:16 +01:00
d55f72f3df
minor: Rename assetCache constructor param in UUIDGatherer to assetService which is what it is.
2012-10-20 02:35:39 +01:00
6ad8d3c43f
Merge branch 'master' into careminster
2012-10-20 02:33:24 +01:00
ac037dfe21
Add method doc for IPresenceService
2012-10-20 02:26:08 +01:00
1937e5f1ec
Relocate temporary debug message for sending group IMs to online members only so that we can add ms it takes to send.
...
This is chiefly to assess how long it may still take to send messages to such filtered groups.
2012-10-20 02:13:00 +01:00
da2b23f18d
Improve efficiency of friends notification by only make one PresenceService call for all friends rather than one for each friend.
...
However, large groups could still take a very long time since we still need to message each avatar on different simulators.
2012-10-20 02:02:13 +01:00
cd3762ca9f
Add experimental [Groups] MessageOnlineUsersOnly option for Flotsam XmlRpc groups.
...
This retrieves and caches information from the PresenceService to only send messages to online users.
This is reported to much improve performance for large groups where most users are offline.
Cache is 20 seconds to balance requests against users not receiving messages until cache updates.
This is an alternative to an approach where login/logout notification is sent directly from simulator to groups service.
However, I'm not convinced that this PresenceService approach is actually better. Needs more thought.
2012-10-20 01:26:04 +01:00
6cca713679
Fix build break from commit e469879
2012-10-20 01:08:52 +01:00
de869028cb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-20 01:04:08 +01:00
e469879725
Add "debug groups verbose <true|false>" region console command
...
This allows one to turn on super-verbose groups debug logging on and off whilst the region is in operation.
2012-10-19 23:45:55 +01:00
d94c4646cc
BulletSim: add asset fetching so BulletSim works with new physics asset handling.
...
Refactor some names to make them available for the asset tracking and fetching.
2012-10-19 15:43:31 -07:00
f422b9b388
BulletSim: reorder avatar collision checking to eliminate double collision_end.
...
Various tweekings to avatar shape/mass/inertia/etc.
Remove change from avatar radius to diameter. But still the avatar sinks.
Collision_end now happens immediately rather than at the next subscription time.
2012-10-19 10:52:31 -07:00
e87a179c89
BulletSim: change nonimal physics frame rate to 55 to give same numbers as ODE.
...
Change character scaling to represent size of capsule (diameter rather than radius)
Modify create capsule call to pass radius and height.
Eliminate errors when calculating shape inertia (should have some type checking).
2012-10-19 10:52:23 -07:00
fc33afddd3
BulletSim: remove code in ShapeCollection that hinted at shape sharing.
...
Add new function to ParameterDefn for calling BulletSimAPI to set values.
Tweaking to BSCharacter parameter setting to try and have avatars stand.
2012-10-19 10:52:14 -07:00
eaccfa6d99
BulletSim: Fix small problems with last patch: BSScene.World properly initialized and setting of C++ parameters commented out. Comments and logging added.
2012-10-19 10:52:06 -07:00
fd7a097849
BulletSim: Update BSCharacter to use API2 interface.
...
Add capsule shape to BSShapeCollection().
Remember last updated values so inter frame diffs can be computed.
Parameterize avatarStandingFriction and reduce to 10 from 999.
The latter high value made avatars very hard to push.
Set CCD parameters for prims and characters of specified.
2012-10-19 10:51:58 -07:00
276600ab71
Merge branch 'master' into connector_plugin
2012-10-19 07:46:00 -04:00
99bb6c9304
Move PluginManager
...
Move PluginManager out to OpenSimFramework for general use
2012-10-19 07:38:36 -04:00
a936b9b7d3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-19 04:53:22 +02:00
b51c26ab40
UbitOde stop doing a copy of the asset data using just the reference to
...
it. It costs a lot of cpu and doesn't seem all that usefull.
2012-10-19 03:50:00 +01:00
f7dcd33008
minor: Increase attachment name field from 36 to 50 chars in "attachments show" report
2012-10-19 03:12:58 +01:00
6ba42e9e75
Fix a few minor issues in ArchiveReadRequest logging.
2012-10-19 02:54:13 +01:00
71b73d6dc3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-19 02:52:12 +01:00
af5383e479
altering documentation for llGetLinkName, as the current documentation is rather lengthy for a "summary".
2012-10-19 02:48:59 +01:00
645e3171b4
since llGetLinkName has a "simplest case", it should be the first check made.
2012-10-19 02:48:59 +01:00
597df51f91
the simplest case for llGetLinkName also applies to the LINK_THIS constant
2012-10-19 02:48:59 +01:00
ec044537d5
ensuring that operand order in llGetLinkName is internally consistent
2012-10-19 02:48:59 +01:00
32171708c3
normalize quaternion.Slerp outputs
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-10-19 01:37:46 +01:00
739782627a
[UNTESTED] core Ode: let broken mesh physical prims collide with land as
...
the defaul basic box so they don't go off world.
2012-10-19 01:25:30 +01:00
e5760430c5
Merge branch 'master' into careminster
2012-10-19 01:20:13 +01:00
28483150e2
[UNTESTED] core Ode: let broken mesh physical prims collide with land as
...
the defaul basic box so they don't go off world.
2012-10-19 01:19:48 +01:00
0f70460a32
minor: comment out currently unused logger in DynamicTextureModule
2012-10-19 00:39:18 +01:00
9417176389
Make "show part" console commands print out information about each item the part contains
2012-10-19 00:37:25 +01:00
33a67b691e
[UNTESTED] core Ode: stop trying to load a broken asset. Make broken
...
assets behave like phantom by Nebadon request
2012-10-19 00:36:32 +01:00
29ab5a6bfe
Merge branch 'master' into careminster
2012-10-19 00:32:25 +01:00
38e96afa38
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-10-19 00:31:30 +01:00
b058ba5859
[UNTESTED] core Ode: stop trying to load a broken asset. Make broken
...
assets behave like phantom by Nebadon request
2012-10-19 00:30:48 +01:00
453192d721
Merge branch 'ubitwork' into avination
2012-10-19 01:02:07 +02:00
845228b35e
minor: Convert ad-hoc list building in ObjectCommandsModule to use ConsoleDisplayList
2012-10-18 23:58:29 +01:00
4fe6d8c3a4
Merge branch 'master' into careminster
2012-10-18 23:48:35 +01:00
75f5e66d1c
Add local and UUID to information output of "show object" and "show part" region console commands
2012-10-18 23:45:07 +01:00
1f3c9db2b9
Add --full option to "show object name/uuid/pos" to show info on all parts of an object, not just whole object summary information.
2012-10-18 23:41:18 +01:00
8aa43e72e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-18 23:32:40 +01:00
8ce7ab721d
Merge branch 'ubitwork' into avination
2012-10-19 00:12:30 +02:00
a960273e91
Add number of inventory items to information displayed via "show part" console command
2012-10-18 23:02:57 +01:00
a2c93133be
Remove extraneous calls to the now commented CheckSculptAndLoad
2012-10-18 21:23:57 +01:00
afab5f5cd1
extend coment to include all unused SOG CheckSculptAndLoad()
2012-10-18 21:13:25 +01:00
7ab83f9eb2
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
...
now
Signed-off-by: Melanie <melanie@t-data.com>
2012-10-18 21:13:02 +01:00
de44e93aa2
missing changed file
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-10-18 20:58:34 +01:00
1e7fb2dc36
i update core ode plugin and make it load is meshs (i hope)
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-10-18 20:58:12 +01:00
72c925a6c9
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
2012-10-18 20:56:34 +01:00
caf2dcde70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
2012-10-18 20:42:43 +01:00
c9cbdc5eaf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-18 16:36:02 +02:00
7228ad7a51
extend coment to include all unused SOG CheckSculptAndLoad()
2012-10-18 15:30:42 +01:00
2e8e8d576e
Remove redundant and annoyingly modal message box in upload processing.
2012-10-18 13:20:50 +02:00
991151250d
If we're avoiding printing a long request warning for a GetTexture CAP call, check we received a request handler first since this is not guaranteed.
...
Resolves harmless logged exception when content type and generic xml rpc requests take more than 3 seconds.
2012-10-18 00:39:43 +01:00
0811f3d28d
minor: Remove event method doc from LLClientView that I forgot in the last commit (1de80c)
2012-10-18 00:34:10 +01:00
3651cc0378
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2012-10-18 00:06:43 +01:00
1de80cdafe
minor: move recent OnAgentUpdate/OnPreAgentUpdate event doc up into IClientAPI from LLClientView
2012-10-18 00:04:23 +01:00
3ec2923022
Reuse the same AgentUpdateArgs object for each AgentUpdate UDP packet (of which there are 10 a second) rather than constructing a new one every time.
...
We can do this because AgentUpdate packets are handled synchronously.
2012-10-17 23:54:05 +01:00
9b68446811
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-10-17 23:50:48 +01:00
faf6b56839
Explicitly return only the incoming AgentUpdate packet as this is the only one we pool atm, rather than attempting to return all incoming packets.
2012-10-17 23:08:14 +01:00
2ed59ad8ac
If RecycleBaseUDPPackets = true, also pool IncomingPackets to reduce memory churn
2012-10-17 21:08:15 +01:00
0ca9666932
Merge branch 'ubitwork' into avination
2012-10-17 20:46:38 +02:00
322eefbb6f
Allow the console to be used by gods as well as region owners.
2012-10-17 01:31:05 +02:00
416bc19da7
Merge branch 'avination' into careminster
2012-10-17 00:13:49 +01:00
39cbf4f7a1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
2012-10-17 00:12:30 +01:00
ad60a29c93
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-10-17 00:03:02 +01:00
f35826eb31
minor: Make BasicCircuitTests.SetUp() call overriden base method instead of ignoring it.
2012-10-16 23:50:45 +01:00
4e5b2346a5
Add LastMemoryChurn stat using existing data so we can more quickly tell how memory churn changes rather than waiting for the average to move.
2012-10-16 23:44:52 +01:00
fc861c7904
Add optional pool for the UDPPacketBuffer objects that handle all incoming UDP data.
...
Even when an avatar is standing still, it's sending in a constant stream of AgentUpdate packets that the client creates new UDPPacketBuffer objects to handle.
This option pools those objects. This reduces memory churn.
Currently off by default. Works but the scope can be expanded.
2012-10-16 23:35:05 +01:00
c4fcfec24e
Merge branch 'master' into careminster
2012-10-16 23:22:37 +01:00
db4ca57590
Make it possible to separate start and stop lludp packet processing from the console for debug processes.
...
This is controlled via the "debug lludp start <in|out|all>" and "debug lludp stop <in|out|all>" region console commands.
The command "debug lludp status" will show current status.
2012-10-16 21:55:00 +01:00
513e63c95a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-16 12:40:31 +02:00
e8936366f5
coment a debug warning
2012-10-16 11:39:58 +01:00
10ed5b08c7
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-16 12:27:37 +02:00
91b83fd45e
fixes
2012-10-16 11:26:05 +01:00
fa52effb27
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
2012-10-16 04:30:01 +01:00
8459b98f68
minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now.
2012-10-16 01:40:25 +01:00
ab0294f010
Add missing category paremeter to llGiveInventoryList grid IM construction.
...
This was a regression from 16c9c1dfhttp://opensimulator.org/mantis/view.php?id=6360
2012-10-16 01:33:35 +01:00
0eb457442d
minor: Add missing newlines and spacing to help for "debug eq" console command
2012-10-16 01:31:51 +01:00
d469bde849
minor: Add/correct some doc messages associated with entity teleport.
...
I believe UseCircuitCode is sent on EnableSimulator EQ message, rather than EstablishAgentCommunication
At least with LL 3.3.4, EstablishAgentCommunication appears unnecessary in the teleport context -
viewer still requests it though possibly only after TeleportFinish(). However, we will continue to send it.
2012-10-16 01:20:41 +01:00
3ac6a423f7
minor: comment out "Registered seed capability" message for "Received SEED caps request" message for now.
...
I think this is more useful right now since it tells us if the viewer requested a seed caps at all in various scenarios (such as when teleporting to a new region).
2012-10-16 00:54:25 +01:00
8c2564c05c
minor: Comment out the region console caps message for now.
2012-10-16 00:40:28 +01:00
aba078c93f
Fix perms when linking an object. Set root part perms to the perms
...
of the link set to make the build floater behave consistently.
Fixes permissions exploit introduced on 23 August.
2012-10-14 17:32:46 +02:00
ce26730d4e
Allow bypassing perms dialog (console only)
2012-10-14 17:31:29 +02:00
de3ff44406
Make texture sedning use only two threads to make things less harsh on bandwidth
2012-10-14 17:10:26 +02:00
7040c0aa5a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 23:45:58 +02:00
1e03344411
missing file
2012-10-13 22:45:09 +01:00
0886d99f1b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 23:37:25 +02:00
5986b4ee39
add mesh cache expire on region startup. Expires will be relative to
...
previus expire (assumed done only once at startup). File 'cntr' on cache
folder stores time. Deleting it will force a skip on expire. Default time
is 48hours before previus startup to account for failed ones etc.
2012-10-13 22:30:34 +01:00
dc460579fd
minor: Fix and elaborate on log information printed when an unrecognized estate method is received from the client.
2012-10-13 01:47:10 +01:00
eef92a9df6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 02:45:42 +02:00
666fb744a3
retouch mesh ids
2012-10-13 01:41:18 +01:00
946c2e7e7c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-13 01:05:28 +01:00
330b976a62
Improve on TBG Renfold's fix to llRequestSimulatorData DATA_SIM_POS by only performing HG regionflags service check if the region secret is not empty.
...
An empty RegionSecret is never HG, whilst a non-empty one may be HG or being genuinely used as a RegionSecret.
2012-10-13 01:03:09 +01:00
f6e166cd0b
Now using region flags for llRequestSimulatorData DATA_SIM_POS.
...
If the region is not classed a hypergrid region, then the region secret is checked to make sure that it is a valid UUID.
Just a temporary fix at this time.
2012-10-13 00:50:34 +01:00
4bd64c887d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 01:49:49 +02:00
9ada03bcdd
missing file (again)
2012-10-13 00:49:08 +01:00
fdd6e0361e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 01:43:44 +02:00
48d2258f41
longer meshs identification keys, so first part on disk cache is it's asset id
2012-10-13 00:41:19 +01:00
2034a096a6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 00:47:06 +02:00
13cb64a2c5
missing file
2012-10-12 23:46:48 +01:00
77b170f1f6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-13 00:40:07 +02:00
6e21796584
[TEST] disk cache meshs
2012-10-12 23:37:28 +01:00
9501925397
Fix a merge issue
2012-10-12 19:23:35 +01:00
6ce93b22d1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-12 19:05:06 +01:00
8c40215834
BulletSim: only use native sphere shape if it is a sphere.
2012-10-12 07:41:31 -07:00
fba59d905c
Get rid of accidental scene start left in ScenePresenceAutopilotTests
2012-10-12 03:20:27 +01:00
b9c2a1508e
Fix problems with regression tests by allowing invoke of Update() with a finite number of frames even if the scene isn't active.
2012-10-12 03:19:12 +01:00
ab7b7c5d3d
Get Watchdog to log thread removal
2012-10-12 02:59:28 +01:00
b5a3c74a5c
Add "active true|false" to "debug scene" console command.
...
This allows the scene update and maintenance loops to be started and stopped for debug purposes.
2012-10-12 02:52:08 +01:00
b7e75d467c
minor: Use && instead of & when deciding whether to print Improve/ObjectUpdate packet out messages when debug is turned on.
...
Practical effect is probably none.
2012-10-12 02:10:30 +01:00
8873a4a8fc
minor: Fix bug in categorization of blocks reused stat from packetpool
2012-10-12 01:59:47 +01:00
21d0cbf703
Add AgentUpdate to PacketPool. This is the most common inbound packet from viewers.
2012-10-12 01:39:37 +01:00
87a87ebb9a
BulletSim: fix problem with some shapes (like cylinders) being implemented as cubes.
2012-10-11 17:37:27 -07:00
711a736097
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-12 01:40:47 +02:00
a91be67a6e
commit the right files!
2012-10-12 00:39:58 +01:00
b0738e1c06
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-12 01:36:55 +02:00
d5cfe1c0be
remove some more debug spam on ode
2012-10-12 00:36:01 +01:00
3af2095cbc
minor: Comment out "Client requested range for texture ... but" message. This is not useful during normal operation.
2012-10-12 00:27:12 +01:00
59a17ad676
Fix percentage stats to multiply by 100. Adjust container name for packetpool stats.
2012-10-12 00:26:15 +01:00
8a402850dd
Enable reuse of data blocks for ImprovedTerseObjectUpdate using existing Packetpool code.
2012-10-12 00:21:45 +01:00
387ce8ef35
Fix build break by moving OpenSim.Framework.Console back below HttpServer in the build order.
...
Luckily, it turns out Framework.Monitoring doesn't need to reference Console directly.
2012-10-12 00:10:51 +01:00
2e9ef015f7
Fix packetpool for ImprovedTerseObjectUpdate packets.
...
These were neither being returned or in many places reused.
Getting packets from a pool rather than deallocating and reallocating reduces memory churn which in turn reduces garbage collection time and frequency.
2012-10-11 23:58:37 +01:00
f5f5f2e3fb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-11 23:56:03 +01:00
1f2472d0fc
Extend "show stats" command to "show stats [list|all|<category name>]"
...
This allows different categories of stats to be shown, with options to list categories or show all stats.
Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism.
This commit also adds percentage stats for packets and blocks reused from the packet pool.
2012-10-11 23:28:53 +01:00
b24190ec98
BulletSim: remove some unused API2 calls because they were removed from Bullet 2.81
2012-10-11 14:01:29 -07:00
5b82f18d64
BulletSim: normalize physics FPS to 45 (for real this time).
2012-10-11 14:01:25 -07:00
a86fedd25f
BulletSim: normalize physics FPS to 45.
2012-10-11 14:01:22 -07:00
3a458e2a36
BulletSim: Use full linkset mass when computing vehicle gravity force. Add taint-time specification to new AddForce().
2012-10-11 14:01:18 -07:00
919569f6ec
BulletSim: Change defaults for constraint CFM and ERP to make large linksets more rigid. Remove mass calculation for terrain (it should stay a static object).
2012-10-11 14:01:14 -07:00
a791620622
BulletSim: cosmetic changes (comments and renaming). Give mass to terrain to improve interactions.
2012-10-11 14:01:10 -07:00
68698975f1
BulletSim: Add Force* operations to objects to allow direct push to engine.
...
Update BSDynamics to use same (don't want to delay updates til next taint-time.
Suppress queuing a taint update for position and orientation calls if value
does not change.
Move Bullet timing statistics call from C# back to C++ code.
Throttle taints per simulation step and add parameter to set.
By default, don't create hulls for physical objects. Add a
parameter to turn on and off.
2012-10-11 14:01:07 -07:00
87825b0abe
BulletSim: Fix crash when linking large physical linksets.
...
Properly remove and restore linkage constraints when upgrading
a prim's mesh to a hull.
Lots more debug logging.
Definitions and use of Bullet structure dumping.
Centralize detail logging so a Flush() can be added for debugging.
2012-10-11 14:01:03 -07:00
01f498bfb4
Remove spammy debug for IM
2012-10-11 21:10:25 +02:00
c8393dd0be
Add logging to help track sequence of events
2012-10-11 07:38:15 -04:00
b768c35f6f
Assign endVector before control leaves ObjectCommandsModule.TryParseVectorRange() in order to fix mono 2.4.3 compile failure.
...
This doesn't fail the compile on mono 2.10.8.
2012-10-11 00:05:34 +01:00
efd9791506
Add "delete object pos <start-coord> to <end-coord>" console command.
...
This allows one to delete objects within a certain volume.
See help on console for more details.
2012-10-10 23:30:48 +01:00
83073ebd03
Implement plugin unloading
...
Plugin may be enabled and disabled on the fly.
2012-10-10 09:35:08 -04:00
756ac4f321
Correct osSetContentType() threat check to query osSetContentType rather than osSetResponseType
2012-10-10 01:39:47 +01:00
280dc717ee
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-10 02:38:36 +02:00
d554c0d574
normalize quaternion.Slerp outputs
2012-10-10 01:37:59 +01:00
11d8119a21
Remove osDropAttachment threat level check wrongly placed in OSSL_Api.ShoutErrorOnLackingOwnerPerms.
2012-10-10 01:37:57 +01:00
62fd29bd9a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-10 01:58:06 +02:00
8fa91686db
add some quaternion normalizations to keep errors under control
2012-10-10 00:57:33 +01:00
528085adef
minor: Add method doc to EventManager.OnNewClient, OnClientLogin, ClientClosed, OnRemovePresence that any long-running operations should be launched on a thread separate to the event thread.
2012-10-10 00:48:20 +01:00
a271afa2aa
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-10 01:36:19 +02:00
c0cdeec4c0
debug
2012-10-10 00:36:06 +01:00
e76b01a201
Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to prevent an inactive connection being left behind if the user closes the viewer whilst the connection is being established.
...
This should remove the need to run the console command "kick user --force" when these connections are left around.
2012-10-10 00:26:43 +01:00
57122769de
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-10 00:02:05 +02:00
a19a189fec
fix debug :)
2012-10-09 23:01:26 +01:00
3f26cf9b62
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 23:58:15 +02:00
e238ece327
debug...
2012-10-09 22:57:28 +01:00
a3c0e3ed26
minor: elaborate method doc on Scene.NewUserConnection()
2012-10-09 22:19:47 +01:00
9ad670e82c
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 20:43:59 +02:00
ce497ce379
debug...
2012-10-09 19:43:06 +01:00
785671e242
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-09 17:29:44 +01:00
40bf789ad7
Disambiguate use of RegionFlags in NullRegionData
...
This was not necessary with the nant build but is for xbuild, since xbuild includes associated project DLLs
And so picks up OpenMetaverse.dll even though it isn't referenced by OpenSim.Data.Null.dll
2012-10-09 17:20:01 +01:00
7e90ea3551
av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - No Avatar Avatar Collisions. This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment.
2012-10-09 10:41:16 -04:00
764270a0d8
Add config option to plant avatar where they are reducing avatar avatar 'pushability' av_planted see OpenSimDefaults.ini. Use when you have unruly visitors that rudely push each other around. Still allows a small amount of movement based on the avatar movement PID controller settings. You can increase the spring tension in the PID controller and really prevent any movement if you would like.
2012-10-09 09:26:11 -04:00
a960efeaba
Fix registry issue
...
Rebuild registry if loading from a local dll to give access to the addin data for it on the first pass.
2012-10-09 08:00:02 -04:00
92849c5cc3
missed some conflict markup
2012-10-09 07:59:44 -04:00
252af020b0
Merge branch 'master' into connector_plugin
...
Conflicts:
OpenSim/Server/ServerMain.cs
2012-10-09 06:44:14 -04:00
700ad535a2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 06:21:56 +02:00
315f3ee0e5
avoid crashing so debug is seen
2012-10-09 05:21:09 +01:00
005553e9d9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 06:10:05 +02:00
d0773dcd6a
another debug msg
2012-10-09 05:09:43 +01:00
d35a0b63e2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 05:32:58 +02:00
8717541288
force allocation of mesh data on creation ( messy code version )
2012-10-09 04:31:50 +01:00
e62cdc50f4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 03:58:25 +02:00
5ef48c5980
temporary debug code
2012-10-09 02:57:51 +01:00
ef3cc2e507
minor: Add documentation to IGridService.GetRegionFlags()
2012-10-09 01:40:55 +01:00
a0d047413b
Once again, forgot to add a file.
2012-10-09 01:37:02 +01:00
73c9abf5f2
Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
2012-10-09 01:35:27 +01:00
4b386760fe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 02:06:05 +02:00
4c512ada58
fire a extra terseupdate when stopping (like in loosing physics). In some
...
cases things seem not to stop
2012-10-09 01:04:29 +01:00
7be1b30914
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 01:45:11 +02:00
2e223c8ce2
Change ray to land colision range limitation so it has no impact on other
...
geom types
2012-10-09 00:44:02 +01:00
61cc62eac9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 01:29:09 +02:00
3bf7201fd4
move terrain geom to own ode space. Limit range on raycast if includes
...
terrain until ode doesn't eat all stack. Add a pre-simulation method to do
pending actors changes (except mesh assets still not ready to use), to be
optionaly called before firing heartbeat. [UNTESTED]
2012-10-09 00:18:39 +01:00
d342adaa87
Merge branch 'master' of git://opensimulator.org/git/opensim
2012-10-08 15:25:26 -07:00
f65218f826
Fix build break
2012-10-08 19:02:21 +01:00
ff92330523
Add a ServiceList section to Robust .ini to get rid of the long string
2012-10-08 17:57:22 +01:00
90a39379f0
Allow other whitespace characters than spaces in Robust connection string
2012-10-08 17:36:40 +01:00
8894f4ad77
Change permissions on child prim inventory items when god mode "force
...
permissive" is used.
2012-10-08 01:34:32 +02:00
2d2c4e3a86
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-08 00:55:44 +02:00
a1fcfe8677
a few changes/fix (?)
2012-10-07 23:54:15 +01:00
398d92dc40
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 09:54:48 +02:00
48d8fbc9ae
bug fix + make costs visible for testing
2012-10-07 08:53:55 +01:00
1af4d8b7f8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 07:34:17 +02:00
a0b4e68060
refix so we can compile it, loosing alpha scultps fix on core meshmerizer
2012-10-07 06:33:13 +01:00
c42df1259f
fix wrong file commited
2012-10-07 06:16:47 +01:00
03ef125ba0
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-10-07 06:13:24 +01:00
4a87a8f3b9
comment out a spam coment on core Meshmerizer
2012-10-07 06:11:51 +01:00
4efc90ef37
i update core ode plugin and make it load is meshs (i hope)
2012-10-07 05:53:52 +01:00
0c5b36a4f7
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 03:12:21 +01:00
9be2d5c77d
Fix merge issues
2012-10-07 03:03:24 +01:00
f7df68d922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 02:48:28 +01:00
7e1eecdf73
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 02:22:28 +02:00
78ce7a0a04
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
...
now
2012-10-07 01:20:52 +01:00
440726250c
Added parts to manage repositories and plugin management
...
This is working - more testing to follow, then soem documentation
2012-10-06 11:48:21 -04:00
13c4fd7271
refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is what it actually represents
2012-10-06 04:06:27 +01:00
9de991301c
Make UserSessionID a class rather than a struct, so that later updates to value suceed (rather than having to pull the data out and reinsert back into the Dictionary).
...
Fixes http://opensimulator.org/mantis/view.php?id=6338
2012-10-06 04:04:50 +01:00
16c9c1dff7
On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates.
...
The viewer would not see the folder move without this, either on accept or decline.
This commit also updates the TaskInventoryOffered message to better conform with the data LL uses
Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail,
message is just folder name in single quotes, message is not timestamped.
However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side.
Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
2012-10-06 02:34:49 +01:00
91ca3117cb
Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full update. There should be a better way to indicate which properties have changed that is non LLUDP-centric
2012-10-05 17:32:07 -07:00
6f220a8679
Trigger ObjectAddedToScene when loading objects from oarfile. Already triggers when creating, duplicating or loading from database, incoming attachments, etc
2012-10-05 17:30:27 -07:00
ceb33b24f7
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-05 07:04:58 +02:00
5254c0de8f
Merge branch 'avination' into ubitwork
2012-10-05 06:00:45 +01:00
1fb53e7103
Fix bug in implementation of "show part pos" that would not filter probably.
...
Also refactors more of ObjectCommandsModule to remove duplicate code
2012-10-05 04:31:43 +01:00
22f6fa49e3
Add "show part pos" console command to match "show object pos"
2012-10-05 04:22:08 +01:00
16feed456a
refactor: eliminate some now duplicate code in ObjectCommandsModule
2012-10-05 04:16:38 +01:00
68859af3f8
Add Vector3.Zero return on TryParseConsoleVector() which fails on mono 2.4.3 but not mono 2.10.9
2012-10-05 03:58:52 +01:00
633e1ed62c
Add missing ConsoleUtil from last commit
2012-10-05 03:57:35 +01:00
130768b16a
Add "show object pos <start-coord> to <end-coord>" command to simulator console.
...
This allows you to display details of all objects in a given bounding box.
Values parts of the co-ord can be left out as appropriate (e.g. to get all objects between the ground and z=30.
See "help show object pos" for more details.
2012-10-05 03:52:42 +01:00
8cd1dc8d60
minor: Add missing license information from the top of IUserManagement
2012-10-05 02:07:28 +01:00
d87813a194
Finally fix build break by allowing UserManagementModule (which constructs a packet directly) to reference OpenSim.Region.ClientStack.LindenUDP.
...
This time I actually properly did a clean build
2012-10-05 02:02:19 +01:00
046113c137
Print number of objects found with "show object name" and "show part name" simulator console commands
2012-10-05 01:46:28 +01:00
03136df1a7
Forgot to actually remove the packetpool set code from scene.
2012-10-05 01:45:49 +01:00
7c7cdf3431
Read PacketPool config in LLUDPServer with other config params rather than in Scene.
...
This is to resolve previous build break.
This unnecessarily but harmlessly reads and sets the parameter multiple times - scene was doing the same thing.
2012-10-05 01:43:29 +01:00
4832ed6960
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-05 01:32:02 +01:00
f0178a6a41
refactor: Move OpenSim.Framework.PacketPool to OpenSim.Region.Clientstack.Linden.UDP
...
This is to allow it to use OpenSim.Framework.Monitoring in the future.
This is also a better location since the packet pool is linden udp specific
2012-10-05 01:12:56 +01:00
db00402fa8
make sure a buffer is closed, and changed a misleading log msg
2012-10-05 00:14:49 +01:00
276fdbc1b3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-04 15:33:17 -07:00
5b90f5bb17
One more abstraction for GridUser so that it can be overridden in a sub-class.
2012-10-04 15:32:49 -07:00
d5ea203f93
Fix threading in remote asset connector
2012-10-05 00:15:55 +02:00
637e9a10db
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-10-04 20:16:23 +01:00
d98af79f77
Make the asset retrieval concurrency a config switch. The current value
...
of 30 is still hanging badly on some mono versions. The switch defaults to
30 to preserve current behavior.
2012-10-04 08:41:06 -07:00
b977f962fa
Allow default animation to be stopped to be replaced with another one.
...
Fixes Mantis #6327
2012-10-04 15:42:52 +01:00
efb9b7014e
Allow default animation to be stopped to be replaced with another one.
...
Fixes Mantis #6327
2012-10-04 15:20:04 +02:00
717802ab09
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 09:16:21 +02:00
89d342b5ce
more changes and more non active code
2012-10-04 08:14:52 +01:00
840d56dcec
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 06:30:51 +02:00
113549c2e9
apply cmic fix to multi layer wearables
2012-10-04 05:29:32 +01:00
fa5fd77823
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 06:06:21 +02:00
893b44497d
Merge branch 'avination' into ubitwork
2012-10-04 05:05:57 +01:00
5bf8c54207
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 05:59:03 +02:00
51e1830f86
more changes. Most code not in use
2012-10-04 04:55:53 +01:00
aa52c8b20f
Output monitor data in response to console command on MainConsole.Instance rather than m_log
...
This should really be happening for all console commands (though many don't).
However, things might get difficult if both a console command and other code invoke the same paths.
2012-10-04 02:17:57 +01:00
3d36a6d55c
Add generic PercentageStat.
...
Not yet used.
2012-10-04 01:27:40 +01:00
e717398f6c
Add experimental "slow frames" stat, available in "show stats" and via the monitoring module.
...
This increments a SlowFrames counter if a frame takes over 120% of maximum time.
This commit also introduces a generic OpenSim.Framework.Monitoring.Stat which is available to any code that wants to register a statistic.
This is more granualar than asking objects to create their own reports.
At some point this will supersede earlier IMonitor and IAlert facilities in MonitoringModule which are only available to scene code.
2012-10-04 00:32:42 +01:00
e6c9b09006
Merge branch 'master' of /home/opensim/var/repo/opensim into modular_config
2012-10-03 19:14:40 -04:00
a2ab3b88de
Soliciting for comments on smoothness of physics objects for this build.
...
This introduces expected contact point hints to the ODE Collider to better determine when to throttle updates as excessive. This /should/ smooth physics objects out again, however, I cannot know every configuration of OpenSimulator, so I'm requesting that testers please examine this change on their build.
Thanks!
2012-10-03 18:30:44 -04:00
57bfd38e2a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 00:18:57 +02:00
a9f2bc150f
missing changed file
2012-10-03 23:18:35 +01:00
d657c48abf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 00:17:19 +02:00
9988558ec1
meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled
...
for all physics engines)
2012-10-03 23:14:56 +01:00
3e71c71cbf
Add modular configuration for Robust connectors
...
We can provide modular ini for connectors...
look for our configuration in the following places...
1) in the default ini/-inifile
2) in the named file (ConfigName) located in the configured directory
(see Robust[.HG].ini [Start] section for ConfigDirectory)
3) in the repository named in the connector (ConfigURL)
In this case, the file will be written into the configured
directory with the specified
See example connector/service @ https://github.com/BlueWall/SlipStream
for testing.
2012-10-03 16:07:11 -04:00
33b2096c5f
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-03 21:38:35 +02:00
4f51cc325c
making meshworker have more work..
2012-10-03 20:36:41 +01:00
149c2adf7d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-03 20:35:29 +02:00
7137b234b4
introduce a ODEMeshWorker class, should be pure cosmetic changes for now
2012-10-03 19:33:28 +01:00
b9baab5521
Fix the use of the wrong index when locating the assets associated
...
with wearables. The fact that this hasn't caused problems earlier
suggests either that no one is using multiple layers of wearables or
that this code is useless because the assets are coming in with the
wearables request.
2012-10-03 10:45:57 -07:00
8a552ac907
Merge branch 'master' into careminster
2012-10-03 17:40:13 +01:00
bf565e9747
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-03 17:40:11 +01:00
653a98e891
Fix a viewer crash issue
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-03 17:39:13 +01:00
fdacb88b29
Fix a viewer crash issue
2012-10-03 17:11:02 +02:00
e56ef2720e
I propose that 0.5m/step change for linear velocity is too big of a change to control the reporting of a new angular velocity. I think that this could be here for one of two reasons, 1. vehicles and llMoveToTarget with axis lock, or 2. To attempt to make things look more stable in the physics scene then they really are, however, this also really affects the angular velocity reporting negatively causing things to spin wildly and jump back into place repeatedly. To compromise, if the prim is a vehicle or is being used as a motor target, the original functionality is still applied. If that's not the case, angular velocity is reported with a linear velocity of 0.02m/step. To be clear on the effect of the physical world... When you push things, there's still a lag time where you walk into the object but once the object is in motion, it begins to move as you would expect so results in slightly more realistic motion.
2012-10-03 02:30:23 -04:00
df3d1d1301
Minor Modification, switch /2 to 0.5f in ODEPrim.Velocity
2012-10-02 23:14:35 -04:00
23d5bafa7f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-10-03 00:24:33 +01:00
f433ee317b
Attempt to fix Mantis #6311 . Honor a destination folder if one is given
2012-10-02 23:03:52 +01:00
ca5c0814f4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-10-02 23:02:53 +01:00
f1886c449c
Attempt to fix Mantis #6311 . Honor a destination folder if one is given
2012-10-02 23:02:01 +01:00
a1679517d3
correcting typo
2012-10-02 22:14:47 +01:00
f555febdb7
taking into account the recent introduction of implicit operators
2012-10-02 22:14:46 +01:00
ce7694c108
added perms checking, duplicated functionality to methods that do not require perms and have higher threat level
2012-10-02 22:14:46 +01:00
c677c04f10
fixing copypasta
2012-10-02 22:14:46 +01:00
35b7c80e0b
implementing osDropAttachment & osDropAttachmentAt
2012-10-02 22:14:46 +01:00
e81e19a3b4
string format arguments in wrong order
2012-10-02 22:11:40 +01:00
210f227fe6
BulletSim: Make parameter value defaults match what should be the default and what is in OpenSimDefaults.ini. Comment and debug printout changes.
2012-10-02 11:14:15 -07:00
ce47d0c454
BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its children of BSPrim and BSCharacter.
2012-10-02 11:14:09 -07:00
d8a786870b
BulletSim: Fix problem where box shapes were not being rebuilt if the shape type changed.
2012-10-02 11:14:03 -07:00
ce97ebdc88
BulletSim: Fix linkset problem where delayed manipulations of child objects was using the child shape address at call time rather than the one created at taint time.
2012-10-02 11:13:57 -07:00
b6b505163c
BulletSim: call ForcePosition and ForceOrientation in BSDynamics so there is no lag between what the vehicle code sees and what the physics engine is using.
2012-10-02 11:13:51 -07:00
1e5869dcf6
Add Flush() method to LogWriter. Also correct line endings to Linux form.
2012-10-02 11:13:45 -07:00
f2c78281ce
BulletSim: fix the FloatOnWater code so avatars can normally go underwater.
2012-10-02 11:13:39 -07:00
33617e09a1
BulletSim: impliment FloatOnWater OS function.
2012-10-02 11:13:32 -07:00
c1740a2903
Correct my name in CONTRIBUTORS.txt
2012-10-02 11:13:26 -07:00
5221f2421e
BulletSim: remove warnings for unused variables.
2012-10-02 11:13:20 -07:00
54ec8b197b
Add money event routing to the script engine.
2012-10-02 01:25:55 +01:00
14b659e550
Send money() events to the clicked prim. Reverting a change I made over a year ago.
2012-10-02 01:17:46 +01:00
402128bb53
Prevent the ExtraSettings code from crashing SQLite driven sims.
2012-10-02 00:51:38 +01:00
e40cc46712
Merge branch 'master' into careminster
2012-10-02 00:06:02 +01:00
0b9bf236dd
On more virtual method
2012-10-01 15:55:24 -07:00
503ce70f74
Allow setting connection limits, part 2
2012-09-30 16:31:23 +01:00
060d6fe8f4
Allow setting max connections for an endpoint
2012-09-30 16:30:16 +01:00
7cc89cdadc
Add using clause I missed
2012-09-30 15:57:49 +01:00
f8a4b61954
Allow up to 12 simultaneous connections to a given endpoint rather than 2
2012-09-30 15:49:51 +01:00
91a5c602e3
Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow ."
...
But the patch is here, in case anyone wants to try it.
This reverts commit 531edd51d8
2012-09-30 07:48:03 -07:00
b9a883f1ca
Merge branch 'master' into careminster
2012-09-30 15:46:43 +01:00
531edd51d8
Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow .
...
Thanks R.Gunther (rigun@rigutech.nl ) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
2012-09-30 07:22:55 -07:00
14a4b146bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-30 06:52:19 -07:00
5b69872655
Made a method of GridUserService virtual so it can be overridden.
2012-09-30 06:51:49 -07:00
944b1ed237
Merge branch 'avination' into careminster
2012-09-29 21:47:08 +01:00
71dd55a1ce
Merge branch 'master' into careminster
...
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-09-29 19:21:07 +01:00
4e9509dafa
Get rid of some unnecessary casts in RemoteAdminPlugin.
...
This was stopping http://code.google.com/p/opensimtools/wiki/RemoteAdminPHPClass from working with some methods (e.g. create_user).
However, this casting has been around for at least 2 years so I'm puzzled that it worked in the first place, though it probably is extremely old sample code.
2012-09-29 02:57:28 +01:00
f457952755
Fix bug where debug http level 6 could not be specified. Also converts newlines at this level to '\n' to enable them to be logged.
2012-09-29 02:38:21 +01:00
818379ba14
Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object is attached from the scene.
...
Enables previously disabled regression test.
Based on SingpostMarv's patch in http://opensimulator.org/mantis/view.php?id=6302 but I prefer a simpler approach that does not expose a resume scripts option right now.
2012-09-29 01:14:23 +01:00
fae869c4ca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-29 00:09:12 +01:00
d588467d5b
Extend attachment regression test to check for appropriate attach event firing.
...
This reveals that the event is not being fired when an object is attached from ground, which is incorrect.
This check is temporairly disabled.
2012-09-29 00:07:11 +01:00
76e9cc41bd
BulletSim: remember to release the physical body and shape when a prim is destroyed. This fixes many problems with physical linksets.
2012-09-28 12:34:50 -07:00
6f89975526
BulletSim: add separate runtime and taint-time linkset children lists to keep the creation of constraints separate from runtime.
2012-09-27 22:02:13 -07:00
74dea4cfd5
BulletSim: rename some constraint variables to be consistant with other name use.
...
Added callbacks for shape and body changes in GetBodyAndShape() so the linkset
constraints can be picked up and restored. A better design might be to have
a "prim shape changed" event. Think about that.
Added constraint types to general constraint class.
2012-09-27 22:02:08 -07:00
7b65985047
BulletSim: remove the trailing spaces from lines to make git happier
2012-09-27 22:02:03 -07:00
5781d4d52d
BulletSim: remove the unused body management code from BSPrim. There is no going back now.
2012-09-27 22:01:57 -07:00
f82b903dee
BulletSim: Fix linkset crash. Caused by the different body and shape
...
pointers at runtime and at taint-time. Now passes the body into the
taint.
Vehicles zero inertia when active to eliminate Bullet's contribution
to vehicle motion.
2012-09-27 22:01:52 -07:00
4589bc84a3
BulletSim: Terrain sets proper collision flags on creation.
...
Static objects are set to ISLAND_SLEEPING rather than DISABLE_SIMULATION.
Might reconsider this and, alternatively, have dynamic objects force activation.
Clean up use of DetailLog().
2012-09-27 22:01:47 -07:00
735d89e369
BulletSim: btGhostObjects working to make 'volume detect' work.
...
Rearrangement and cleanup of shape collection code. Much more readable.
Enabling and use of collision filters and masks.
Addition of ID to body creation BulletSimAPI calls so always set in
shape for collision reporting.
Change default of ShouldSplitSimulationIslands and ShouldRandomizeSolverOrder
from 'false' to 'true'. When 'false', this suppresses NO_CONTACT_RESPONSE
which makes volume detect fail.
2012-09-27 22:01:42 -07:00
d016051fa0
BulletSim: renamed members of BulletShape, BulletSim and BulletBody
...
so the members case is consistant. Caused modifications everywhere.
New logic in BSShapeCollection to track use and sharing of shapes.
I just reslized, though, that shapes cannot be shared because the
shape's UserPointer is the localID of the prim and is required
for tracking collisions. More changes coming.
Added DuplicateCollisionShape2() to API and changed BuildNativeShape2
to take a ShapeData structure so don't have to pass so many parameters.
This matches the latest version of BulletSim.dll.
Additions and removal of DetailLog() statements for debugging.
2012-09-27 22:01:37 -07:00
42802669dd
BulletSim: fix regression that caused cylindar shapes to have a box collision shape
2012-09-27 22:01:31 -07:00
22290ef35a
BulletSim: complete code for managed code shape and body tracking. Not debugged.
...
Eliminate some null exceptions created adding the above code.
Add and remove some detailed logging statements.
2012-09-27 22:01:26 -07:00
a27e4ce6cb
BulletSim: add class and infrastructure for shape and object
...
tracking in the C# code. Needed for the changing body type
(to and from GhostObjects) for volumeDetect.
2012-09-27 22:01:21 -07:00
91efccabdc
BulletSim: Convert BSCharacter to use common BSPhysObject code and variables.
...
Fix avatar height calculation to properly account for the capsule ends.
Rearrange some locking in TerrainManager to eliminate possible race conditions.
Move DetailLog() definition into common BSPhysObject class.
Some variable renaming to make usage clearer (refactor.rename makes this so easy).
2012-09-27 22:01:16 -07:00
ee7cda261c
BulletSim: move a bunch of common logic out of BSPrim and BSCharacter
...
and into the parent class BSPhysObject.
Rework collision logic to enable extra collision after done colliding.
Rename 'Scene' to 'PhysicsScene' to differentiate it from the simulator 'Scene'.
2012-09-27 22:01:11 -07:00
b5af17c8e3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-28 01:54:39 +01:00
3db10fdbef
Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concurrent thread use provoking mono crashes.
...
Same rationale as commit 13690582
2012-09-28 01:50:21 +01:00
6511c3b5c6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-27 16:43:38 -07:00
7a50705188
Removed the bits about the TOSModule. That module doesn't go into core. WARNING: migration on GridUser withdrawn too, but left the migration number there.
2012-09-27 16:43:18 -07:00
acdbe6e9dd
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-28 00:16:22 +02:00
f05ca1a0fe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-28 00:15:58 +02:00
7e21ddeeff
Fix a possible NRE
2012-09-28 00:15:14 +02:00
58e55ae075
make some forgotten changes be done by simulation thread not by caller
2012-09-27 23:14:42 +01:00
285039949c
Update the Http server with a few additional properties. Adapt the test
...
server code to match.
2012-09-27 18:27:49 +01:00
001ec0e2e6
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-27 17:29:44 +01:00
b52311b8f8
Remove a core undo call that we don't need.
2012-09-27 17:16:39 +01:00
9eca154bce
Make it possible to rescale SOGs when they are not in a scene.
2012-09-27 15:48:47 +01:00
637f5440fe
Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster
2012-09-27 15:46:35 +01:00
fdd4361928
Fix very recently introduced race condition where a CreateNewItem outracing an UploadAsset request could throw an exception because m_asset did not yet exist.
...
This was accidentally introduced in 4fc0cfb
2012-09-27 15:28:43 +01:00
7d6ac75f87
Comment out old m_storeLocal from AssetXferUploader.
...
This was only used if none of new item, update item or update task item had been set.
But since all transactions go through these paths this old code is redundant.
2012-09-27 15:27:56 +01:00
5c8b9ff9ed
Insert transaction ID into AssetXferUploader constructor rather than at UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first.
...
This was preventing the previous race condition fix in 4fc0cfb
2012-09-27 15:27:25 +01:00
65e294267d
Move UDP update task item code to AssetXferUploader to match existing create user item and update user item mechanisms
...
This is done for consistency and to allow removal or some access methods that increase code complexity.
However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead
2012-09-27 15:26:58 +01:00
1a902fceb5
Fix occasional race condition failure when creating new clothing/body parts in the viewer or updating existing assets.
...
On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem.
It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail.
So instead we always set up a Xfer object on either the asset or inventory item update request.
This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed)
2012-09-27 15:25:32 +01:00
daf84d7385
Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminster
2012-09-27 12:39:24 +01:00
5482c086f0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-27 01:16:22 +02:00
a0065ad616
create a new PollServiceHttpRequest req per loop since they can be sent to
...
another working thread
2012-09-27 00:14:50 +01:00
2bf42f30af
Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.
...
This controls how many undo steps the simulator will store for each prim.
Default is now 20 rather than 5 as it briefly was.
The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
2012-09-27 00:12:34 +01:00
b9934fc4db
Don't store undo states if a scene object is manipulated when it is not in a scene.
...
Adds regression test for this.
2012-09-26 23:31:10 +01:00
31c636f1e4
refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.
2012-09-26 23:25:50 +01:00
36e3123069
Make it possible to rescale SOGs when they are not in a scene.
2012-09-26 23:17:21 +01:00
327320d1a7
Enforce existing 5 action hardcoded undo limit.
...
This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source.
This commit enforces that limit, which will soon become configurable.
Regression test for undo limit added
Should help with http://opensimulator.org/mantis/view.php?id=6279
2012-09-26 22:49:44 +01:00
21f30a1b5f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-26 22:49:05 +01:00
6cf51c329a
Merge branch 'ubitwork' into avination
2012-09-26 23:49:02 +02:00
2998a2df6a
Streamline and improve llGetMass
2012-09-26 22:30:09 +02:00
90dd5844d6
Add basic undo/redo regression tests.
2012-09-26 21:28:43 +01:00
810e24af49
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-26 22:04:27 +02:00
a70352db17
don't send a partial contents report if we are sending all data
2012-09-26 21:03:31 +01:00
3c77b8f463
Use GridUser properly for foreign users.
2012-09-26 12:40:41 -07:00
c3ea00f16e
add assettype mesh to list of binary assets
2012-09-26 20:31:34 +01:00
80133f9ebe
Show the user's home url too on the console command.
2012-09-26 11:27:31 -07:00
2f61763923
Not really a change, just added a reminder to fix something here.
2012-09-26 11:26:51 -07:00
4da310c870
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-26 17:50:20 +02:00
9a04269644
fix GetTextureHandler range
2012-09-26 16:49:39 +01:00
de87eca20f
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-26 17:20:48 +02:00
be9cef8682
missing file
2012-09-26 16:20:26 +01:00
b07b29c247
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-26 17:18:31 +02:00
617f1b9223
just remove the damm thing
2012-09-26 16:17:49 +01:00
24539a074e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-26 16:44:34 +02:00
7e3eba1064
Seems nothing actually need the request body for getevents. so change
...
control flag to false
2012-09-26 15:41:57 +01:00
abb4b9fcae
UriModule GetEvents also doesn't need a request body
2012-09-26 15:11:59 +01:00
67fa657746
keep watchdog happy using it to kill his threads
2012-09-26 04:52:19 +01:00
7d2cd0d935
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 20:04:10 -07:00
ae58cf4224
TOS module. WARNING: migration in GridUser table.
2012-09-25 20:03:49 -07:00
495a3e7daf
Oops, that should be inside the curly bracket.
2012-09-25 19:54:42 -07:00
8346954798
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-26 04:06:46 +02:00
654dd289f2
more changes to PollService
2012-09-26 03:05:27 +01:00
5d986002fd
fix priorityQueue to correctly use the fairness counts starting at 8 for
...
nonimediate queues. Imediate queues where not taken into account so it
was unused.
2012-09-26 00:17:54 +01:00
ddd9384b39
Fix very recently introduced race condition where a CreateNewItem outracing an UploadAsset request could throw an exception because m_asset did not yet exist.
...
This was accidentally introduced in 4fc0cfb
2012-09-25 23:30:25 +01:00
b96a53962b
Comment out old m_storeLocal from AssetXferUploader.
...
This was only used if none of new item, update item or update task item had been set.
But since all transactions go through these paths this old code is redundant.
2012-09-25 23:13:45 +01:00
eb5bec96e4
Insert transaction ID into AssetXferUploader constructor rather than at UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first.
...
This was preventing the previous race condition fix in 4fc0cfb
2012-09-25 22:54:20 +01:00
2f795e4fa6
Move UDP update task item code to AssetXferUploader to match existing create user item and update user item mechanisms
...
This is done for consistency and to allow removal or some access methods that increase code complexity.
However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead
2012-09-25 22:08:11 +01:00
4fc0cfba3c
Fix occasional race condition failure when creating new clothing/body parts in the viewer or updating existing assets.
...
On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem.
It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail.
So instead we always set up a Xfer object on either the asset or inventory item update request.
This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed)
2012-09-25 21:35:39 +01:00
77355295da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 10:46:42 -07:00
4ec2fc4cc2
Deleted extraneous debug message
2012-09-25 10:46:21 -07:00
96ebf7b029
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-25 05:05:14 +02:00
ef3d44240e
missed change
2012-09-25 04:03:15 +01:00
4d681bfde6
do the same to webFecthInvDescModule
2012-09-25 03:59:19 +01:00
2cb17d6fbb
change GetTextureModule processing
2012-09-25 03:38:45 +01:00
020103c51e
Documenting object-related events
2012-09-24 22:59:02 +01:00
de77bf7c5b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-24 23:58:44 +02:00
a1a0a90720
more upload changes (plus untouch prebuild.xml)
2012-09-24 22:57:33 +01:00
ac02cadbdb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-24 22:52:33 +01:00
1cfd63d0b4
Documenting LSL script-related events
2012-09-24 22:44:37 +01:00
421071bd8a
Text changes for upload messages
2012-09-24 23:19:57 +02:00
653d97b739
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-24 22:25:21 +02:00
ca67ee60ac
add missing transactionID in SendInventoryItemCreateUpdate. and make use
...
of it on inventoryAccessModule, etc. Most likelly it's needs where there
is a transactionID not zero
2012-09-24 21:22:08 +01:00
bbaf2c5a80
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-24 20:14:00 +01:00
ca9d3760ab
Merge branch 'ubitwork' into avination
2012-09-24 17:41:48 +02:00
6963b96bd0
If an asset upload transaction doesn't exist for a CreateInventory request,
...
simply process it as if UUID.Zero had been given.
2012-09-24 13:41:48 +02:00
68ece236a6
Protect the responses map with a lock. Also remove ugly "this." type of
...
member notation.
2012-09-23 23:55:28 +02:00
b8119ada59
Merge branch 'ubitwork' into avination
2012-09-23 23:47:56 +02:00
2d02405186
Change the poll service to use a thread pool for replies to make sure the
...
event queues aren't blocked by other traffic.
2012-09-23 23:16:25 +02:00
a5d969d92f
Comment out asset error for sculpts/meshes. If an asset is missing it's missing.
...
We can't put it back so we don't need to know.
2012-09-23 20:57:36 +02:00
291e57afb4
Merge branch 'ubitwork' into avination
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
2012-09-23 19:18:49 +02:00
2112962311
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-23 16:13:24 +02:00
64db9e4114
try to allow free uploads for testing, if users prefix names with "TEST-". Let
...
textures get into inventory again. Both features under config control.
Have direct warnings to client, including a final one on upload complete
since i see nothing. problems: textures don't showup in inventory til
relog, also issues with permitions. A few more changes
2012-09-23 15:04:10 +01:00
1c42337381
HG Rez object: warn the user if the item or asset cannot be found.
2012-09-22 14:41:19 -07:00
87d810217e
Guard against inventory get failures.
2012-09-22 14:01:51 -07:00
772aedc731
Make BaseHttpServer throws say something useful.
2012-09-22 14:01:07 -07:00
80a81896b6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-22 22:15:35 +02:00
11e05217df
report asset upload errors the right away
2012-09-22 21:14:15 +01:00
fb6d6e5cca
HG 2.0: User Agent Service now can also control where the local users can go. Domain-name and user-level based. \o/
2012-09-22 11:11:48 -07:00
93eaaf2ade
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-22 17:47:59 +02:00
4bba72b7af
removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some
...
more needed fields in request
2012-09-22 16:47:15 +01:00
d25a67851d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-22 13:37:42 +02:00
7de67d5680
removed unused data in MeshUploadFlag response
2012-09-22 12:00:14 +01:00
48f4b32d7f
More HG 2.0: access control at the Gatekeeper. \o/
2012-09-21 21:03:14 -07:00
ebd99c9e3e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 17:59:42 -07:00
21a6ef5bb6
This fixes HG attachments' missing assets (textures, etc).
...
Also, further improvements on HGUuidGatherer: if the assets are already in this grid don't fetch them again.
2012-09-21 17:58:44 -07:00
a6f7328216
Remove deprecated parameters for region_id.
...
Remove deprecated parameters for region_id as anounced in january 2012.
2012-09-22 01:30:38 +01:00
b36ef60aca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 01:05:33 +01:00
8d7b1f8aa0
Documenting non-LSL script-related events
2012-09-22 00:57:29 +01:00
b0da4b8d13
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 16:45:35 -07:00
cfa022700d
Moved the small HGUuidGatherer class to the file where its parent class is. No need to keep 2 separate files.
2012-09-21 16:45:16 -07:00
9ab5c5040d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 00:26:32 +01:00
5df3944607
Fix llListFindList() returning no match when there is a match with a script constant component in the source list.
...
Adds regression test for this case.
Based on http://opensimulator.org/mantis/view.php?id=6156
Thanks SignpostMarv.
2012-09-22 00:23:25 +01:00
fb2ace6fff
Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already downloads the assets, so we don't need to do it again...
2012-09-21 15:55:58 -07:00
f931c0a868
Minor: may avoid crashes of sims that still don't have this configuration section.
2012-09-21 15:04:41 -07:00
f4cc19968c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 07:45:26 -07:00
b542622b3a
HG 2.0: added asset import/export policies at the sim too.
2012-09-21 07:44:18 -07:00
5f97b3e1d9
Minor: change the return value of unsuccessful posts to string.Empty.
2012-09-21 06:41:32 -07:00
f9c24c9414
read model upload cost parameters from config [Economy] section
2012-09-21 11:50:14 +01:00
e379566e6e
Improvement over last commit: refactor the asset permissions code, so that it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
2012-09-20 19:50:57 -07:00
80f486c778
minor: Make slow outgoing request log messages consistent with other log messages
2012-09-21 01:59:28 +01:00
632a42e2b1
Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't been instantiated with an assetServerURL then call down to overriden UuidGatherer.GetAsset() instead of calling m_assetService.GetAsset() itself - these two codepaths are now identical.
2012-09-21 01:57:13 +01:00
bceef401fa
Simplify UuidGatherer by performing asset fetch synchronously rather than using the async call but waiting for completion anyway!
2012-09-21 01:36:23 +01:00
a6b2a35ddf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-21 01:36:16 +02:00
1b0abf8f0c
Comment out the long unused afaik HTTP agent handlers.
...
As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now. Other similar code uses HTTP or stream handlers instead.
So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway.
If this facility is actually being used then please notify me or uncomment it if you are core.
2012-09-21 00:29:13 +01:00
e29d563557
Add request number counting to incoming HTTP requests in the same way that this was already being done for outgoing HTTP requests.
...
This allows us to associate debug logging messages with the right request.
It also allows us to put a request number on 'long request' logging even if other debug logging is not enabled, which gives us some idea of whether every request is suffering this problem or only some.
This is a separate internal number not associated with any incoming number in the opensim-request-id header, this will be clarified when logging of this incoming request number is re-enabled.
This commit also adds port number to HTTP IN logging to allow us to distinguish between different request numbers on different ports.
2012-09-21 00:09:17 +01:00
33aa6d172f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-20 15:51:27 -07:00
3089b6d824
More HG2.0: Added permission policies in HGAsset Service based on asset types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
2012-09-20 15:49:22 -07:00
a5b3989e5d
Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the request took.
...
This is only printed if debug http level >= 4 and the request didn't take more than the time considered 'long', in which case the existing log message is printed.
This displaces the previous log levels 4 and 5 which are now 5 and 6 respectively.
2012-09-20 23:18:19 +01:00
387a1bb283
Add ability to turn on/off logging of outgoing HTTP requests flowing through WebUtil.
...
This is for debugging purposes.
This is controlled via the "debug http" command which can already log incoming requests.
This now gains a mandatory parameter of in, out or all to control what is logged.
Log messages are also shortened and labelled and HTTP IN or HTTP OUT to be consistent with existing UDP PACKET IN and PACKET OUT messages.
2012-09-20 23:17:44 +01:00
5d63c20122
refix prior commit
2012-09-20 15:41:16 +02:00
9ff6c85325
Make uploads free for now - we will have to announce this
2012-09-20 15:39:46 +02:00
bf987f96d2
Fix model upload rotations and offsets ( i hope )
2012-09-20 14:32:30 +01:00
b481a78234
Don't fail to create an IRC nick if nick randomization is disabled in the IRC module.
...
Patch from http://opensimulator.org/mantis/view.php?id=6293
Thanks Starflower.
2012-09-20 02:01:01 +01:00
d667f9d260
Documentation of teleport-related events
2012-09-20 01:56:18 +01:00
696b3f66c4
minor tweaks to existing comments for IDE goodness
2012-09-20 01:50:40 +01:00
49e2872f9e
Documentation of agent-related events
2012-09-20 01:50:40 +01:00
61f4523e01
Documentation of object-related events
2012-09-20 01:48:50 +01:00
a74167bb06
Documentation of OnPluginConsole
2012-09-20 01:47:03 +01:00
f2a9d26118
Make ResendAppearanceUpdates = true by default in [Appearance] in OpenSimDefaults.ini.
...
This resends appearance uuids to avatars in the scene once a minute.
I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet.
The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached.
This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
2012-09-20 01:40:05 +01:00
629138d4fa
Change texture price back to 10 C$
2012-09-19 13:01:34 +02:00
a44939e951
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-19 04:59:48 +02:00
5317b1053f
be more tolerant to small prims, skipping them, only failing if they are
...
more than half of total. Add a state control to NewFileAgentInventory
to avoid more than one at a time per client. ( Incomplete and possible not that good)
2012-09-19 03:53:51 +01:00
453c008998
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-19 02:35:12 +02:00
fb32604b41
create a single ModelCost provider for the caps instance. Let it know and
...
check scene prim size limits.
2012-09-19 01:33:16 +01:00
967d42d393
Correctly override and call base OpenSimTestCase.SetUp() method in GridConnectorsTests and ArchiverTests.
...
Remove unrelated compile warning from AttachmentsModuleTests.
2012-09-19 01:06:42 +01:00
51ca84afdf
coment out mesh model upload code to add textures and individual meshs
...
assets to inventory, since it may actually be a bad ideia since good
model textures are deply related to it and there is no current use for
independent mesh assets. Added the option to have a reduced free for textures (2.5 C$ as is, total textures cost rounded to nearest int) compensating for the fact that they can't be used outside the model or its parts.
2012-09-19 00:29:16 +01:00
9d973ec3b3
Cleanup from prev. commit
...
Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
2012-09-18 10:12:32 -04:00
d29fc53052
Fix some inconsistencies in configurartion: NonPhys prims
...
Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*.
Please update your OpenSim.ini and Regions.ini to reflect these changes.
2012-09-18 09:53:45 -04:00
b4209caadd
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-18 03:47:42 +02:00
e9af09084c
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-18 02:17:16 +02:00
ac2380bbfa
Add booleans to control whether we actually crete inventory items
2012-09-18 02:12:07 +02:00
e8ba26eac8
***TEST*** still bad... create inventory itens for model textures and meshs. Issues: meshs get into root folder, viewer and viewer does not update inventory until relog ( the upload funtion needs to return more information) ,etc. Droping a mesh into a prim, makes viewer think we dropped a sculpt map, but it does work, viewer displays the mesh and physics work (as physics is stored at the sculpt information fields). Textures show up in Textures folder, just its to costly to find that default folder as is..
2012-09-18 01:07:44 +01:00
fd20ef5c91
add some locks to GetTextureModule
2012-09-17 22:35:36 +01:00
c1eec3b828
on upload store mesh list contents as mesh assets. Build prims by instances not
...
meshs. (some prims can have same mesh)
2012-09-17 21:15:07 +01:00
c3666c9ec3
make sure client still has money at upload
2012-09-17 19:38:05 +01:00
7f5b1182ef
same cleanup
2012-09-17 19:09:51 +01:00
4336806ddf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 18:49:56 +02:00
1740325392
removed broken fee compression
2012-09-17 17:49:10 +01:00
91312daeb2
Moving ScriptModuleComms into the CoreModules tree.
2012-09-17 09:04:54 -07:00
1e3914236d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 16:52:40 +02:00
df77724bbc
let mesh model estimator work even without money module, so other
...
estimations can work
2012-09-17 15:50:59 +01:00
f3f955b19b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 16:38:14 +02:00
5915dfc26f
Make use of mesh cost functions
2012-09-17 15:37:05 +01:00
d739246030
Merge branch 'master' into careminster
2012-09-17 14:18:03 +01:00
0e5f5538bc
Documentation of IScriptModuleComms.RegisterConstant and IScriptModuleComms.LookupModConstant
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-17 14:15:52 +01:00
f9721573d9
Implementing ability to register script constants and invocations on a region module automatically
2012-09-17 14:15:47 +01:00
1dd75fcdb4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-09-17 14:15:22 +01:00
590c752c23
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 14:40:09 +02:00
5bbc4fb2a5
missing file for suport of mesh upload cost
2012-09-17 13:39:38 +01:00
434704fa99
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 14:35:01 +02:00
6e115798b7
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-17 14:34:12 +02:00
c7948a669a
preventing a null reference exception from being thrown
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-17 13:29:15 +01:00
5e626ce55d
script invocations cannot have void return type
2012-09-17 13:29:01 +01:00
f2308c819e
Remove spammy "axislock" debug.
2012-09-17 12:58:59 +02:00
380962d359
HG2.0: Generalized the allowed HG appearances to be more than 1.
2012-09-16 16:45:57 -07:00
8dae7928d3
Make agent creation at destination asynchronous. Failures here are pretty
...
much guaranteed to be fatal and the few times this would dosconnect an agent
are more than made up for by the increased throughput of replying and
closing the connection vs. keeping it open during the heavy work. Also causes
better feedback to the viewer as the time is now split between Requesting
Teleport and Connectiong to Destination.
2012-09-16 23:41:34 +02:00
a79bafaaaf
Change the close tmeout from 2 to 3 seconds on teleport. This may
...
prevent being logged out after a successful teleport.
2012-09-16 22:52:45 +02:00
7d5942d154
Make IncomingCloseChildAgent not send a stop packet. This may prevent
...
a viewer from being logged out after an otherwise successful teleport.
2012-09-16 22:51:04 +02:00
a76ce4f64d
Make the agent being kicked a child agent first so there won't be a ghost
2012-09-16 22:50:35 +02:00
a97436f2f1
Catch a nullref in the code to suppress GetTexture warnign spam we can't
...
do a thing about anyway.
2012-09-16 16:42:30 +02:00
66bf1376b5
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
2012-09-16 04:21:18 +01:00
db774d4292
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
daa4745fb7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-15 19:35:33 -07:00
de69a24574
More on HG2.0: added the possibility of controlling the appearance that avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
2012-09-15 19:33:51 -07:00
b602b476ad
BulletSim: update DLLs and SOs and remove some debugging code.
2012-09-15 15:36:13 -07:00
c77be802d2
BulletSim: some debugging prints in BSPrim for tracking changes in linkset children.
2012-09-15 15:32:16 -07:00
1826b2b18e
BulletSim: add the debugging routine DumpRigidBody2() to API2.
2012-09-15 15:32:11 -07:00
f35bd6eb7d
BulletSim: another attempt at computing physics FPS correctly.
2012-09-15 15:32:05 -07:00
dcb94b8a24
BulletSim: remove timeStep parameter from calls for vehicle parameter setting. There is no reason these should be using the simulation time interval for parameter calculation.
2012-09-15 15:31:59 -07:00
6632eb7c05
BulletSim: Remove calculation and passing of unused collied object type.
...
Fix collision code to properly sense mega-region children regions as terrain.
When setting an object physical, reset all the physical properties (friction, ...).
2012-09-15 15:31:54 -07:00
f0a098924e
BulletSim: set all linkset objects center of mass to the whole linkset's center of mass
2012-09-15 15:31:49 -07:00
7c347f4c5c
BulletSim: Add calls to linkset class when object going static or dynamic.
...
Reset center of mass on an object when going dynamic.
2012-09-15 15:31:44 -07:00
d86cbe6379
BulletSim: remove unused NeedsMeshing() code from BSScene.
2012-09-15 15:31:39 -07:00
c0fec70b1a
BulletSim: Add 'IsNativeShape2' call
2012-09-15 15:31:34 -07:00
2c5ff93990
BulletSim: Way too many changes in one commit.
...
Many changes to BSDynamic for readability and commentary.
Linkset hacking for vehicles: don't over mass the root prim.
Add parameter for link constraint solver iterations.
Correct uses of timestep in timescale calculations for vehicles.
Reorganize code/logic for making objects static and dynamic for readability
and use of API2.
Changed most calls in BSPrim to use API2 calls (the new way).
Avatars do not generate default Bullet collision events but do call up
to the simulator for every avatar. Reduces overhead.
Objects added to collision list only if they are processing collisions.
Reduces overhead especially for large numbers of avatars.
Generalize call for water height to GetWaterHeightAtXYZ().
Catch and correct exception getting terrain height when out of bounds.
Correct race condition in Terrain Manager where creation wasn't at taint-time.
Add API calls for constructing compound shapes.
Move NeedsMeshing() logic into object class.
Reorganize logic for object meshing to reduce rebuilding of meshs/hulls.
2012-09-15 15:31:29 -07:00
1ec84ac8b1
Add basic asset connector tests to check behaviour for normal, local and temporary assets.
...
Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load
Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
2012-09-15 02:12:26 +01:00
d5c8c6bc12
For FlotsamAssetCache, always update access times of cached scene assets before looking for files to expire.
...
This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed.
The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced.
This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.
2012-09-15 01:08:15 +01:00
2aa7a22129
Sequence/throttle asset retrievals.
2012-09-14 23:09:07 +02:00
5dd2569bf7
Added unit tests for multi-region OARs
2012-09-14 20:32:25 +01:00
d7e6fe488d
Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the multi-OAR patch there is now only one class that handles this operation.
...
Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105
since that did not directly apply
2012-09-14 20:25:44 +01:00
ce468215d5
Support multi-region OAR files
...
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
2012-09-14 20:25:03 +01:00
387e59ff7f
Revamp the HTTP textures handler to allow a maximum of four fetches
...
at any time and to drop requests for avatars n longer in the scene
2012-09-14 21:24:25 +02:00
6f7825e310
Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID (present as column PrincipalID) parameters in the Avatars table.
...
These are used to invoke avatar service calls but are not in themselves persistable avatar data.
2012-09-14 00:07:39 +01:00
9f93bef111
Allow setting connection limits, part 2
2012-09-14 00:15:10 +02:00
45fe25de0d
Allow some more connections to try to ease lag.
2012-09-14 00:14:39 +02:00
f14b257fc0
Wait longer for arrival cofirmation to aid tps into laggy regions
2012-09-14 00:13:08 +02:00
e1e9855ede
Wait a bit longer for new scene presences to aid tps into laggy regions
2012-09-14 00:12:41 +02:00
52d74cf274
Allow setting max connections for an endpoint
2012-09-14 00:11:23 +02:00
dd0a89a0e6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-13 10:00:52 -07:00
190f9c258b
Restarting to work on HGSuitcaseInventoryService: added the ability for the outside world to retrieve appearance items. Not ACLed yet.
2012-09-13 10:00:29 -07:00
46d8405229
Documentation of parcel-related events
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-13 09:59:25 -04:00
9598c1af9e
correcting a typo that causes c# express to complain about xml comment containing invalid xml
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-13 09:59:25 -04:00
cdc3781f42
Fix usage statement on "debug http" console command since max level is now 5 rather than 3
2012-09-12 23:02:25 +01:00
7df7b86ec5
Fix bug in logging sample input at debug http level 4.
...
Also converts newlines to "\n" text.
2012-09-12 23:01:07 +01:00
e7932682a2
Add a logger so the prior commit will work
2012-09-12 21:24:09 +02:00
d8e9188908
Stop expiry timer when upload is complete. Log if timeout is reached.
2012-09-12 21:14:55 +02:00
5139db2638
Add a timer to time out upload caps handlers that are not used.
2012-09-12 12:56:59 +02:00
224efe7b76
minor: Comment out friends notification log spam for now.
2012-09-12 01:58:01 +01:00
ebb394bbda
Fix indentation and issues where tabs were used instead of spaces in commit 783ee949
2012-09-12 01:45:34 +01:00
c17965eec4
mathematically & hypothetically speaking we want to avoid negative values being written
2012-09-12 01:26:22 +01:00
4ead48f09f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-12 01:24:17 +01:00
41f3f2400e
Documentation of economy-related EventManager events
2012-09-12 01:23:47 +01:00
f06394f195
Allow an incoming identifier to be specified for a JsonStore.
2012-09-11 16:42:07 -07:00
d53a53d4c5
Make "show http-handlers" command available for ROBUST instances as well as the simulator executable.
2012-09-12 00:10:48 +01:00
757d9163fa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-12 00:07:56 +01:00
fd1ee58f87
Add a missing brace, remove a useless temp variable, enable charging.
2012-09-11 22:52:11 +02:00
013e94af5d
report mesh upload costs ( fake values)
2012-09-11 23:06:29 +01:00
25111e703f
Add levels 4 and 5 to "debug http" console command that will log a sample of incoming request data and the entire incoming data respectively.
...
See "help debug http" for more details.
2012-09-11 21:48:51 +01:00
245763b1b0
let LLSDAssetUploadRequest include asset_resources information plus let
...
NewAgentInventoryRequest know about mesh (does nothing with it still)
2012-09-11 20:30:30 +01:00
ad1b9bbba6
documentation (OnSceneObjectPartCopy)
2012-09-11 20:12:45 +01:00
97b8739c1d
documentation (OnRemovePresence)
2012-09-11 20:12:45 +01:00
0760121eb9
documentation (OnNewPresence)
2012-09-11 20:12:44 +01:00
0a22e78f59
documentation (OnClientConnect)
2012-09-11 20:12:44 +01:00
5e51f16ceb
documentation (OnBackup)
2012-09-11 20:12:44 +01:00
fd8a7e64b9
documentation (OnTerrainTick)
2012-09-11 20:12:44 +01:00
ed5f574356
documentation (OnTerrainTainted)
2012-09-11 20:12:44 +01:00
44349f742e
documentation (OnClientMovement)
2012-09-11 20:12:43 +01:00
e3993eefa5
Documenting some of the events on OpenSim.Region.Framework.Scenes.EventManager (OnFrame)
2012-09-11 20:12:43 +01:00
19b00a5b3c
Removing the variable prica handler again. It's never called, was misnamed and
...
probably never worked past the mesh beta.
2012-09-11 17:58:46 +02:00
757a669924
Re-add the module and fix a typo
2012-09-11 17:55:33 +02:00
375ca478dd
Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice
...
which is the name actually used in viewer code.
2012-09-11 17:52:24 +02:00
a6928a479e
Add cost calculation suppor tto the VariablePrice one as well
2012-09-11 17:51:20 +02:00
ead4b8998c
Revert "Remove the unused NewFileAgentInventoryVariablePrice module."
...
It's actually used.
This reverts commit 94a8e5572b
2012-09-11 17:28:37 +02:00
bd1d9a214b
Add the option to have variable costing for uploads
2012-09-11 17:28:13 +02:00
94a8e5572b
Remove the unused NewFileAgentInventoryVariablePrice module.
2012-09-11 15:07:32 +02:00
ba6a2ec526
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-11 13:32:26 +02:00
a6753c14a5
Revamp the v3 inventory sending. Uses threads and some nifty mechanics to
...
leverage the Poll Service without blocking it's workers.
2012-09-11 10:39:43 +02:00
21c476228a
Merge branch 'avination' into careminster
2012-09-10 13:53:00 +01:00
3e1b6b8d20
Merge branch 'master' into careminster
2012-09-10 13:33:47 +01:00
8db5d79f4b
passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly error messages
2012-09-10 13:15:32 +01:00
a2ace1b61a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-10 02:27:26 +02:00
a7250c6ea1
add a extra httppool thread to compensate for webfetchinventory
2012-09-10 01:23:20 +01:00
b7737b7273
webFetchInventory: change control event to simple flag, adjust locking
2012-09-10 01:20:34 +01:00
657428a439
Remove commented code
2012-09-10 01:52:02 +02:00
761bf8c1eb
Merge branch 'ubitwork' into avination
2012-09-10 01:50:41 +02:00
bf56b30024
Adjust namespce of FlotsamCache
...
Place FloatsamCache in the same namespace as our other core asset caches
2012-09-09 14:35:48 -04:00
8321ecb7a2
Revert "Move addin information to CoreModulePlugin.addin.xml"
...
This reverts commit 2ec34580cehttp://opensimulator.org/mantis/view.php?id=6278 .
2012-09-09 13:50:44 -04:00
afb4e06f63
Reduce max concurrent endpoint connections from 50 to 6 (was 2 before)
2012-09-09 17:41:10 +02:00
0556bbefdd
Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM
...
to UUID.Zero because it ties up XMLRPC handlers needlessly.
2012-09-09 16:30:01 +02:00
0d97beefce
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
783ee949ea
implementing per-region configuration of limits on the number of prims one can have in a linkset
...
Applied with changes - patch was based on a repo different from core
Signed-off-by: Melanie <melanie@t-data.com>
2012-09-09 12:59:25 +01:00
d734c1985c
Merge branch 'ubitwork' into avination
2012-09-08 18:03:17 +02:00
b776aa1665
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-08 13:35:09 +02:00
a91ca984d5
llClientView: try to have only one thread per client processing
...
RegionHandleRequests. (code assumes packet handle is called async as it is not)
2012-09-08 12:22:40 +01:00
e041f09750
refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
2012-09-08 00:44:27 +01:00
fa3edcf55c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-08 00:17:57 +01:00
874bde366a
4096 is used in various places as the maximum height of a region, refactoring to be a constant
2012-09-08 00:14:39 +01:00
126eae7100
BulletSim: Add Bullet body and shape to BSPhysObject and rename
...
'Body' to 'BSBody' for disambiguation when reading code.
Complete the API2 interface so nearly all methods on bullet
classes are available to the managed code. The efficient
single call simulation step is kept in place while all
other creation/destruction/parameterization can be done
in the managed code.
2012-09-07 16:05:28 -07:00
3c097cb7a9
BulletSim: Add some comments (gasp) and log messages.
2012-09-07 16:05:22 -07:00
189f51233e
BulletSim: PhysicsActorType() now returns the correct value rather than 'unknown'.
2012-09-07 16:05:16 -07:00
76dc29dc37
BulletSim: Modify collision flag calls to return the current flags.
...
Track current collision flags in BSPrim.
Add BulletSimAPI calls for saving and restoring rigidBodies using
construction information structure.
2012-09-07 16:05:11 -07:00
b379e790a2
Set the maximum number of concurrent connections to a service endpoint
...
to 50. This doesn't work on stock mono but it works in Avination and also
under Windoze.
2012-09-07 23:27:40 +02:00
924df14c5e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
717b11856e
Move addin attributes to RegionCombinerModule.addin.xml
...
Will help in automation of setting version info for addin dependencies.
2012-09-07 13:21:06 -04:00
a99026691b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-07 19:17:21 +02:00
550f6c4ad2
Revert "Move addin information to RegionCombinerModule.addin.xml"
...
This reverts commit ab446bc692
2012-09-07 11:41:47 -04:00
1f18ce516f
Move addin information to RegionCombinerModule.addin.xml
...
Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking.
2012-09-07 11:07:19 -04:00
2ec34580ce
Move addin information to CoreModulePlugin.addin.xml
...
Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases.
2012-09-07 10:18:00 -04:00
71d2d327d0
One more redundante ParcelProprieties on login
2012-09-07 12:50:38 +01:00
c83dd021f3
stop sending duplicated parcelProprieties at login
2012-09-07 11:37:51 +01:00
23be1cf1cd
remove fireandforget call to EnableChildAgents at end on CompleteMovement,
...
since this is already on own thread and its at the end of it.
2012-09-07 09:40:28 +01:00
288baaecaf
Add warning chevrons around the GC.Collect added to Warp3DImageModule in commit 5eb2526
...
Manually calling GC.Collect() really shouldnt' be necessary and is generally regarded as a bad idea.
A GC should occur anyway pretty shortly afterwards.
However, can leave this in development code for now to see if it does actually make a significant difference rather than simply doing a GC a little earlier.
2012-09-07 00:46:24 +01:00
d2b00749ef
Add missing DynamicTexture.cs file from last commit
2012-09-06 23:14:48 +01:00
8f02fd926e
If reusing dynamic textures, do not reuse small data length textures that fall below current viewer discard level 2 thresholds.
...
Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache.
This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request.
This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true
This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
2012-09-06 22:12:05 +01:00
f53ca6285b
Prevent double slashes, try #4
2012-09-06 18:41:21 +01:00
a18c010729
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-06 19:24:26 +02:00
402de5fb78
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-06 18:58:57 +02:00
a03ad8bdb4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-06 18:22:09 +02:00
041fcd6a72
remove extra '/' in assets url
2012-09-06 17:18:34 +01:00
ac6448810e
Prevent double slashes, try #3
2012-09-06 17:39:30 +02:00
3257f4d5d2
Revert "Change string concatenation to Path.Combine to eliminate extra slashes."
...
This reverts commit b9d026666d
2012-09-06 17:31:41 +02:00
012f299052
Merge branch 'ubitwork' into avination
2012-09-06 17:12:42 +02:00
b9d026666d
Change string concatenation to Path.Combine to eliminate extra slashes.
...
Windoze barfs on them.
2012-09-06 17:11:44 +02:00
27d345c9a0
Revert " remove extra '/' in assets url"
...
This reverts commit 041fcd6a72
2012-09-06 17:02:55 +02:00
4215877b48
adding utility method for getting SceneObjectGroup from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:56 -04:00
d2e79e26d7
adding utility method for getting SceneObjectPart from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:46 -04:00
3f6c6eed33
pasting in show uptime code
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:13:07 -04:00
8fe8fdb0c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 05:19:15 -04:00
5eb2526e88
0006270: Warp3D leaks memory on mono based systems
...
Thanks Hiro Lecker for a patch to reduce memory useage with Warp3D map module
2012-09-06 05:18:08 -04:00
fbfd28a61b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 00:16:40 +01:00
a0d0c9f751
If the GetTexture capability receives a request for a range of data beyond that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable.
...
This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests.
This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size.
I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank.
If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution.
However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
2012-09-06 00:11:47 +01:00
641b08aa78
Enables cast from int to float for MOD* functions;
...
Thanks SignpostMarv!
2012-09-05 09:13:16 -07:00
9ae293881a
Make friend notifies and closing child agents async because both can
...
block the heartbeat thread if the sim being contacted is unresponsive
2012-09-04 22:53:52 +02:00
8a537f8f66
Merge branch 'ubitwork' into avination
2012-09-04 13:02:33 +02:00
ed4ad93fef
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-04 11:53:04 +02:00
c298ae9e75
bug fix
2012-09-04 10:51:43 +01:00
a6bbaba7ef
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-04 08:42:15 +02:00
d4fad2ba42
a forgotten file plus minor changes. Imp and SL viewer seem to preserve
...
flight. FS 4.2.2 does not.
2012-09-04 07:32:03 +01:00
1bd47566ce
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-04 06:01:13 +02:00
e1755e2d71
let avatar keep flying in tps to same region. (still bad for other
...
regions )
2012-09-04 04:56:37 +01:00
3fb2523f5b
Remove debug spam
2012-09-04 03:20:37 +02:00
056e66b3de
Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into
...
it's own sub-method
2012-09-04 03:14:39 +02:00
15d5f3d09d
Bump master code up to 0.7.5 now that 0.7.4 is out.
2012-09-04 00:11:14 +01:00
07dbe46ba3
wrapping attachment functions in a region
2012-09-04 00:03:44 +01:00
ff867b59cf
Implementing functing to send messages directly to attachments
2012-09-04 00:03:44 +01:00
d4b8a13a1d
refactoring the grunt work of MessageObject into a private method with a UUID argument
2012-09-04 00:03:44 +01:00
a858c5daee
implementing a function to get the number of attachments worn
2012-09-04 00:03:43 +01:00
8d431c6359
formatting
2012-09-04 00:03:43 +01:00
663bfbb372
although the attachmentPoint argument is a uint, zero is not a valid attachment point
2012-09-04 00:03:43 +01:00
72d20b794a
Revert "made setting rotation match Second Life"
...
This reverts commit f7b88d1c40
2012-09-03 21:54:02 +01:00
f32c74b2ff
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
2012-09-03 21:53:55 +01:00
574a6e3580
Revert "formatting"
...
This reverts commit fb211c64fd
2012-09-03 21:53:46 +01:00
d297eb39e5
Revert "made setting rotation match Second Life"
...
Second Life seems to have introduced a bug, as we have confirmation that SL
behavior changed recently and changed in contradiction to their stated intention
This appears to be another of the bugs SL is notorious for. Signpost and I have
decided to back this out until SL's intention becomes clear.
This reverts commit f7b88d1c40
2012-09-03 21:52:12 +01:00
29218cdb31
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
2012-09-03 21:52:03 +01:00
359f9efc76
Revert "formatting"
...
This reverts commit fb211c64fd
2012-09-03 21:51:54 +01:00
96b50d28f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-09-03 14:05:18 +01:00
fb211c64fd
formatting
2012-09-03 13:55:41 +01:00
a3d140b57c
no need to assign rotation to a variable now
2012-09-03 13:55:40 +01:00
f7b88d1c40
made setting rotation match Second Life
2012-09-03 13:55:40 +01:00
7cfcca87c6
Prevent a nullref if SimStatsReporter tries to report on a sim where psysics are
...
not yet initialized
2012-09-03 13:25:31 +02:00
e2e8b09059
Merge branch 'master' into careminster
2012-09-02 22:15:55 +01:00
c93b2db9f2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-09-01 03:12:10 +02:00
63e6666f22
try to reduce potencial recursive locking
2012-09-01 02:05:28 +01:00
39f5fd0f58
Merge branch 'avination' into ubitwork
2012-08-31 22:30:33 +01:00
ffdc798720
BulletSim: Update BulletSimAPI to match the DLL interface.
...
Major rework of terrain management which finally makes mega-regions work.
Update heightmap of terrain by rebuilding the terrain's body and shape.
There is a problem with just replacing the shape so this workaround
will do for the moment but it will need to be resolved for
mesh and hull switching.
2012-08-31 11:41:33 -07:00
ae852bb873
BulletSim: clean up some variable naming for consistancy.
...
Update DLL API for new terrain and shape/body pattern methods.
Terrain creation and modification uses new shape/body pattern.
Move debug logging callback set to initialization call so logging
is per physics engine.
2012-08-31 11:41:28 -07:00
d3adf9b2b3
BulletSim: fix line endings.
2012-08-31 11:41:23 -07:00
7c140570db
BulletSim: Changes to terrain storage and management so mega-regions work.
...
Moved all terrain code out of BSScene and into new BSTerrainManager.
Added logic to manage multiple terrains for mega-regions.
Added new functions to BulletSimAPI to match the library.
Moved all of the terrain creation and setup logic from C++ code to C# code.
The unused code has not yet been removed from either place. Soon.
Moved checks for avatar above ground and in bounds into BSCharacter.
2012-08-31 11:41:18 -07:00
7b6987ce83
BulletSim: unify physical objects under BSPhysObjects. Now BSScene and BSLinkset only know of BSPhysObject's and there is only one list to search in BSScene.
2012-08-31 11:41:12 -07:00
0376b8ddbc
BulletSim: add new interface for mesh, hull and terrain creation that will move nearly all of the logic into the C# code.
2012-08-31 11:41:07 -07:00
cbdfca1460
Merge branch 'master' into careminster
2012-08-31 15:33:42 +01:00
dac31303b7
Type.Type is RuntimeType
2012-08-31 15:33:15 +01:00
c0feaf54de
Merge branch 'master' into careminster
2012-08-31 14:40:30 +01:00
edd3577b66
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-31 14:34:44 +01:00
054db94d5d
formatting
2012-08-31 14:32:33 +01:00
794c5f5a6d
adding support for static method script invocations
2012-08-31 14:32:33 +01:00
b625579780
moving assignment to new line to make next commit easier to read in diffs
2012-08-31 14:32:33 +01:00
7e41559917
using specific type instead of var
2012-08-31 14:32:33 +01:00
8cd415c2b0
formatting
2012-08-31 14:32:32 +01:00
4c58c1b116
formatting
2012-08-31 14:32:32 +01:00
e6f43023b6
adding support for finding static methods
2012-08-31 14:32:32 +01:00
bcf944db48
assign binding flags to variable
2012-08-31 14:32:32 +01:00
7a9eee8538
no need to assign result to GetMethodInfoFromType
2012-08-31 14:32:32 +01:00
05648c2c4a
changing to use Type argument instead of object
2012-08-31 14:32:31 +01:00
dff746df7b
moving code that will be common into private static method
2012-08-31 14:32:31 +01:00
973f2e8be5
adding documentation to script invokation methods
2012-08-31 14:32:31 +01:00
1b15144208
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-08-31 01:32:18 +01:00
3c019bea8c
Implementing a vastly simpler means of allowing region modules to access GetLinkParts than mantis 6236
2012-08-31 01:19:17 +01:00
68814f904e
Replace SendBannedUserList with Avination's version. Untested in core. Not even test compiled.
2012-08-31 00:37:27 +01:00
fd92560649
Merge branch 'avination' into careminster
2012-08-31 00:34:22 +01:00
3bd3f448a2
Also do other MySQL region settings related calls under m_dbLock, in common with other calls.
2012-08-31 00:33:06 +01:00
7c6e8fab15
Do Windlight storage and removal calls in MySQL under m_dbLock, as is done with all the other database calls.
2012-08-31 00:29:57 +01:00
3ed0d79b00
Make ReuseDynamicTextures an experimental config setting in [Textures]. Default is false, as before.
...
If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them.
This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable).
Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry).
If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated.
CUrrently experimental. Default is false, as before.
2012-08-30 22:57:40 +01:00
d89b974680
If the compile-time DynamicTextureModule.ReuseTextures flag is set, check metadata still exists for any reused asset in case some other process has removed it from the cache.
2012-08-30 22:28:45 +01:00
e402a24972
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 02:35:31 +02:00
a7281003d8
move keyframemotion.copy from sop.copy to sog.copy, where there is
...
newgroup information avaiable.
2012-08-30 01:30:56 +01:00
f15b690687
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 01:33:05 +02:00
1eb7d963cf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 00:31:03 +01:00
194eb78b90
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-30 01:29:43 +02:00
c821153a4f
[possible still bad] make use of keyframemotion.copy on sop.copy, replacing
...
fromdata(seralize). for now its called with null group since sop.copy()
hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
2012-08-30 00:15:46 +01:00
c76c63725b
fixing bug where last element in list is ignored
2012-08-30 00:10:28 +01:00
6b277394c0
refactoring as the list funcs either skip invalid values or recall ToDoubleList
2012-08-30 00:10:28 +01:00
927cbc6762
Merge branch 'ubitwork' into avination
2012-08-30 00:36:37 +02:00
211f4fb411
Sequence inventory descendents requests to reduce inventory server load and
...
movement lag.
2012-08-30 00:34:12 +02:00
adce58b33a
Renaming existing 'torture' tests to 'performance' tests instead, since this better matches what they really do.
...
nant target name changes to test-perf instead of torture, to match test-stress
still not run by default
2012-08-29 23:19:21 +01:00
1f88179a65
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-29 23:16:16 +01:00
ec726413dd
Add VectorRenderModuleStressTests that contains a long running test that generates thousands of vector textures concurrently.
...
Intended for use if there are future issues with mono crashes whilst generate dynamic textures.
This test is triggered via a new test-stress nant target.
Not run by default.
2012-08-29 23:04:00 +01:00
3d736d575f
This partially implements the LSL function to set the response
...
type for an HTTP request. Since the "official" LSL function limits
the use of the response type, it is implemented as osSetContentType
with a string for the content mime type and a threat level of high.
With this function you should be able to implement rather functional
media-on-a-prim application with much less difficulty.
2012-08-29 14:56:51 -07:00
67f18655d5
Allow llList2Key to also act on System.String
2012-08-29 22:06:43 +02:00
f7a60261e9
Merge branch 'ubitwork' into avination
2012-08-29 11:46:57 +02:00
74465df43f
Fix issue with the quit packet being stuck int he queue and a one packet delay.
...
Also fix semaphore excetion caused by enqueueing while dequque is taking place.
2012-08-29 11:45:28 +02:00
34f0694938
Remove Justin's addition to avoid sending incoming packets to inactive clients
...
This also causes the initial AgentUpdate to be rejected because our processing
is asynchronous.
2012-08-29 11:35:21 +02:00
f671e446bf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 11:18:32 +02:00
899337b4a0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
2012-08-29 03:31:13 +01:00
c34b8ed0f0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 04:20:50 +02:00
2e54c3cc8f
A few more changes to keyframes
2012-08-29 03:19:47 +01:00
0c3061f973
implementing rule tracking
2012-08-29 02:10:04 +01:00
3bf7bd6359
track originating IScriptApi method for SL-like error messages. Will add rule number tracking in next commit.
2012-08-29 02:10:04 +01:00
7ea832d47c
Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders.
...
This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder.
Added regression test for this case.
Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService
Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used
since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs.
However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
2012-08-29 02:01:43 +01:00
73b88140ee
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-29 01:37:44 +02:00
72ac0665b2
[Potentially broken] keyframes changes.. since it's there, use timer for
...
crossing retries and not still another thread, etc...
2012-08-29 00:35:06 +01:00
c1cece4b82
Add experimental DynamicTextureModule.ReuseTextures flag, currently only configurable on compile.
...
Disabled (status quo) by default.
This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours.
This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web).
This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures.
A downside is that this stops expiry of old temporary dynamic textures from the cache,
Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours.
2012-08-28 23:06:53 +01:00
378a79e7cc
Add a queue with two priority levels. This is a drop in replacement for
...
the BlockingQueue from OMV, but allows two priorities.
2012-08-28 22:17:17 +02:00
5284e514d5
Fix a nullref while object is being created
2012-08-28 22:16:01 +02:00
aa44df9c04
Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method.
2012-08-28 20:35:17 +01:00
2546e4c2de
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-28 04:27:59 +02:00
ef6e007a4c
[possible still very broken] mess around keyframes. timer events
...
threads overlaps, some null objects exceptions, region crossing...
2012-08-28 03:21:03 +01:00
1e18f0f26a
copying documentation from http://opensimulator.org/wiki/Threat_level
2012-08-28 00:12:35 +01:00
e916b1399f
formatting
2012-08-27 23:39:18 +01:00
72c2d13ac6
refactoring to load from self (fixes ChanneDigger being absent)
2012-08-27 23:39:18 +01:00
a6d689c529
refactoring to assign the first argument to a variable
2012-08-27 23:39:18 +01:00
ab9bfe5156
minor: Simplify return of vector render module name and some very minor removal of unncessary syntax clutter
2012-08-27 23:06:37 +01:00
4e26d039d6
Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams()
2012-08-27 23:03:21 +01:00
3082fdd0f6
Add VectorRenderModuleTests.TestRepeatDrawContainingImage()
2012-08-27 22:58:20 +01:00
e90168c738
Add VectorRenderModuleTests.TestRepeatDraw()
2012-08-27 22:42:40 +01:00
b1d0fab954
fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal
...
DataFormat enum, using values from the KFM constants
2012-08-26 20:33:45 +01:00
d76ff560d4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 23:36:33 +01:00
bfa22e2f52
Make llCollisionSprite not throw anymore
2012-08-25 23:49:37 +02:00
bc4bda4441
Minor formatting cleanup
2012-08-25 21:08:33 +01:00
3d8f393fbe
refactoring to local variable for cleaner code
2012-08-25 21:04:43 +01:00
86d4e45f4d
since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 21:03:47 +01:00
681066050c
Also move the other avatar based overload out of harms way
2012-08-25 18:32:59 +01:00
5f1021faa6
Temprary restructure to avoid conflicts
2012-08-25 18:28:05 +01:00
af6b242071
use SceneObjectPart instead of var
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-25 18:24:52 +01:00
1eb1c1bd4b
renaming to be similar to equivalent Set command
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
2012-08-25 18:19:51 +01:00
007a45aa76
Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster
2012-08-25 18:08:10 +01:00
a5c6cb2fc9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-25 17:34:08 +01:00
6ea95a3294
Fix and refactor region registration. Reorder checks to short-curcuit expensive and destructive ones. Properly fix region reservation and authentication.
...
Make region moves and flags preservation work again as intended. Prevent
failes reservation take-over from damging reservation data.
2012-08-25 17:32:00 +01:00
7a4dba2fdc
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-25 16:33:29 +02:00
6e86b23012
implementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParams
2012-08-25 02:30:23 +01:00
58714b0aca
minor formatting
2012-08-25 02:30:23 +01:00
5203665bb2
refactoring to local variable for cleaner code
2012-08-25 02:30:23 +01:00
2a2e120470
since we will be making the Get return type the remaining ruleset as with the Set return type, we need to move the original return type to a ref param
2012-08-25 02:30:23 +01:00
a8044999fb
use SceneObjectPart instead of var
2012-08-25 02:30:23 +01:00
3d504261b0
renaming to be similar to equivalent Set command
2012-08-25 02:30:23 +01:00
a0d178b284
Following on from f8a89a79, do not allow more than one 'type' folder (e.g. calling cards) to be created in the base "My Inventory" user folder.
...
This is to accomodate situations where viewers will create more than one 'type' subfolder (e.g. calling cards)
But at the same time to prevent multiple such 'system' folders (those in the base "My Inventory" user folder).
This also makes GetFolderForType() only return a folder in the base "My Inventory" folder, if such a type folder exists
2012-08-25 02:00:17 +01:00
f8a89a79eb
Allow multiple calling card type inventory folders to be created.
...
Modern viewers want to create Friends and All folders of this type inside the root Calling Cards folder.
2012-08-25 01:09:12 +01:00
e04047152f
minor: Fix bad log message for failure to create an inventory folder
2012-08-25 00:49:38 +01:00
f3a5e3a02b
Log initial script startup info notice when xengine actually starts to do this for debugging purposes, rather than before it actually starts to do this.
2012-08-25 00:42:32 +01:00
ba58331b29
Extend "Restarting scripts in attachments" debug log message to show actual name of user and the region they are in
2012-08-24 22:56:05 +01:00
f1a71f544b
Merge branch 'ubitwork' into avination
2012-08-24 23:53:14 +02:00
6d48dbf8ca
Remove debug spam
2012-08-24 23:49:31 +02:00
7e17f4296e
Fix background inventory loading (Viewer 3) so it won't lag out the sim
2012-08-24 23:48:01 +02:00
476996bee8
If a connecting scene presence is replacing an existing scene presence then bypass close checks.
2012-08-24 22:38:07 +01:00
01771aca40
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-24 21:38:46 +01:00
cd325fdf02
Pass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down into the 3-parameter AddNewSceneObject() method instead of always hardcoding true.
...
This doesn't affect any core OpenSimulator code since all callers were passing true anyway
But it allows region modules to create objects that are never persisted.
2012-08-24 21:36:20 +01:00
67477290ad
stripping superfluous whitespace
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-08-24 17:44:35 +01:00
582a256646
immediately returning the string.Join operation instead of checking if the list has members
2012-08-24 17:44:14 +01:00
d188272462
refactoring using List.ConvertAll<string>
2012-08-24 17:44:14 +01:00
7cdb564fdd
Merge branch 'master' into careminster
2012-08-24 01:22:44 +01:00
82b23f7cc1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-24 01:20:23 +01:00
a08687aef3
Revert "implementing function to allow scripts to self-replicate as if the owner duplicated them, using the same script delay as llRezObject()"
...
This reverts commit 2ad9d656b3
2012-08-24 01:18:35 +01:00
2ad9d656b3
implementing function to allow scripts to self-replicate as if the owner duplicated them, using the same script delay as llRezObject()
2012-08-24 00:21:42 +01:00
1747030d19
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-24 00:16:58 +01:00
c557684666
Fix bad child prim permissions that can make objects change perms after rezzing
...
Port from Avination
2012-08-24 00:15:30 +01:00
a3cbda0d74
Removed land checking as suggested by SignpostMarv.
...
Now whatever remaining health the avatar has is displayed (float).
This will be 100% (100.000000) if no damage has occurred (as what the viewer should really be seeing anyway).
Returns -1.000000 if the avatar is not found.
2012-08-24 00:13:27 +01:00
4f3fabae5b
Adds osGetHealth.
...
Returns the amount of health (in an integer) that an avatar has left in the scene.
If an avatar is not found or safe is enabled on a region, -1 is returned.
Example usage:
default
{
touch_end(integer _t)
{
key agentID = llDetectedKey(0);
osCauseDamage(agentID, 50);
llSay(0, llKey2Name(agentID) + " has " + (string)osGetHealth(agentID) + "% health left.");
}
}
2012-08-24 00:13:14 +01:00
7fca69222b
Merge branch 'avination' into careminster
2012-08-24 00:07:56 +01:00
783773a0c0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-24 00:07:17 +01:00
aede42b875
If a script state save fails for some reason on shutdown/region removal, get xengine to spit out some useful information and continue to save other script states
2012-08-23 23:13:53 +01:00
c1a0c7fad1
Fix bad child prim permissions that can make objects change perms after rezzing
2012-08-23 23:09:32 +02:00
f8603a215d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-23 01:41:47 +01:00
97c37c370b
Merge branch 'avination' into careminster
2012-08-23 00:12:12 +01:00
4820dfd733
this should be an if-else block in case the non-phys min/max are smaller than the physical min/max
2012-08-22 23:55:01 +01:00
1369058280
Lock disposal of separate gdi+ objects under different threads since this prevents malloc heap corruption seen under Ubuntu 10.04.1 and 11.04 - probably a libcairo issue
...
In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously,
the native malloc heap can become corrupted, possibly due to a double free(). This may be due to
bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX. These problems were
seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1. They go away if disposal is perfomed
under lock.
2012-08-22 23:04:17 +01:00
450207d4d8
Make terrain save every 1000 frames instead of every 50. Database load is a sim killer.
2012-08-22 00:27:54 +02:00
526445c394
Fix group return stuff
2012-08-21 23:28:00 +02:00
9925317239
Fix bug in SoundModule.PlayAttachedSound() where every sound update to an avatar would base its gain calculation on the previous avatar's gain, instead of the original input gain
...
This is similar to commit d89faa which fixed the same kind of bug in TriggerSound()
2012-08-21 22:21:35 +01:00
5273b6880a
Allow updates sent for right pec to go to the client
2012-08-21 21:20:20 +02:00
8d2a37c5a4
Implement seeing busy status in LSL
2012-08-21 20:13:55 +02:00
26224704de
Cause a persistence save if prim flags change
2012-08-21 19:24:41 +02:00
f2ac1b9e8a
Add Camera Offsets to serialization
2012-08-21 16:41:08 +02:00
481c00f50a
refactoring out SetFaceColor
2012-08-20 23:10:25 +01:00
ede3b9ab07
making use of implicit operators and Util.Clip handling of Vector3
2012-08-20 23:10:25 +01:00
b863a15a82
single operation for PRIM_COLOR
2012-08-20 23:10:25 +01:00
aee4353e9c
fix typo
2012-08-20 23:10:25 +01:00
e6fb458597
no-op change for cia.vc test
2012-08-20 22:18:29 +01:00
812c498ef4
When loading an OAR, validate any group UUIDs and properly reconstruct parcel access lists.
...
If a group UUID is present that is not on this simulator then the object or parcel is no longer group owned.
This is a change from previous behaviour where such invalid UUIDs were kept.
This is an adaptation of patch 0002 from http://opensimulator.org/mantis/view.php?id=6105 by Oren Hurvitz of Kitely.
My adaptations are formatting only, apart from the notices about parcel owner IDs not being saved since this has now been fixed.
Thanks Oren.
2012-08-20 22:01:02 +01:00
970727e57e
Tighten up OpenSim.Framework.Cache locking to avoid race conditions.
...
This is to resolve a reported issue in http://opensimulator.org/mantis/view.php?id=6232
Here, the land management module is using OpenSim.Framework.Cache (the only code to currently do so apart from the non-default CoreAssetCache).
2012-08-20 20:55:58 +01:00
bcbd450fe4
Add --force flag to "kick user" console command to allow bypassing of recent race condition checks.
...
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
2012-08-20 20:24:54 +01:00
9aec62f0ac
Fix scripted detach of temp attachments
2012-08-20 15:59:38 +01:00
df3623b01d
Merge branch 'avination' into careminster
2012-08-20 15:59:28 +01:00
7f7f005da4
Merge branch 'avination' into careminster
2012-08-20 15:58:47 +01:00
f71ed7eb79
Fix scripted detach of temp attachments
2012-08-20 15:35:06 +02:00
dd0556abc9
Fix llDialog responses so that they can be heard throughout the region. This now conforms to the behaviour in SL.
2012-08-19 22:05:38 +01:00
0a959343a5
Make the console output from the reigon console hookable
2012-08-18 22:36:48 +02:00
2efd13ae18
Fix a typo
2012-08-18 22:36:42 +02:00
8769e4ee73
Add a reference to OpenMetaverseType.dll to compiled script assemblies.
2012-08-18 19:08:38 +01:00
914f97cb76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-18 19:01:05 +01:00
d72d599056
integrating redundant code into operator
2012-08-18 18:30:00 +01:00
ca33619e11
Rot2Quaternion is now redundant
2012-08-18 18:30:00 +01:00
ffdde05bb7
constructor means not having to manually refer to individual properties
2012-08-18 18:29:59 +01:00
fb84ff96a9
implicit operators mean one does not need to instantiate new objects manually
2012-08-18 18:29:59 +01:00
52d7af05bc
adding missing refactor for LSL_Vector
2012-08-18 18:29:59 +01:00
2b0c8bc480
Implementing operators & constructors for Quaternion
2012-08-18 18:29:59 +01:00
2a70afeca2
Fix the whitespace formatting error introduced by the last patch
2012-08-18 14:00:10 +01:00
5d43e27de2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-18 13:57:50 +01:00
5d7751da89
refactoring for Vector3 operator & constructor tweaks
2012-08-18 13:21:55 +01:00
aee7a31bc3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-18 13:17:39 +01:00
9d6fe1224a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-18 12:57:49 +01:00
e4e5237086
When reporting a thread timeout, create a copy of the info rather than passing the original ThreadWatchdogInfo structure.
...
This is to avoid the possibility of misleading reporting if a watchdog update outraces an alarm.
Should address any remaining issues from http://opensimulator.org/mantis/view.php?id=6012
2012-08-18 00:46:34 +01:00
28d0aff2e3
adding null return to fix building
2012-08-17 23:23:03 +01:00
7068fddd2f
fixing bug that get/set the wrong property for prim types other than sphere & box
2012-08-17 23:23:03 +01:00
466d684fbe
implemented
2012-08-17 23:23:03 +01:00
74f5253a36
attempt to handle InvalidCastException in a manner similar to Second Life
2012-08-17 23:08:24 +01:00
7243d4f842
BulletSim: Properly regenerate hulls when objects made physical.
...
This fixes the problem of non-base shapes (cubes and spheres)
falling through the terrain.
2012-08-17 14:45:18 -07:00
f57c1ac386
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-17 22:31:58 +01:00
0860a0d856
minor: Make xengine debug message on script load a scripting loading message instead.
...
This is more useful if compilation fails due to an uncatchable exception since we know what was being compiled.
2012-08-17 22:30:01 +01:00
03d76e9403
BulletSim: restore most of the Detail logging statements. Will have
...
no effect on non-logging running.
Capture region name that is passed to the physics engine and use
it for detail logging file name prefix.
Fix problem with avatars dropping when flying across region boundries.
2012-08-17 13:34:22 -07:00
5c192b9bab
Modify order of code so SOP doesn't set the physics actor flying
...
property multiple times every time Update is called.
This eliminates zillions of settings which is better for BulletSim.
The should be no functionality change.
2012-08-17 13:34:20 -07:00
ccc69d66a1
BulletSim: add parameters and functionality to specify the mesh
...
level of detail for large meshes.
Remove parameter and code for DetailLog (conditional logging into
regular log file).
2012-08-17 13:34:18 -07:00
8eda290262
BulletSim: comments and parameter changes in dynamics engine.
2012-08-17 13:34:16 -07:00
e31e23d68d
BulletSim: in BSDynamics, merge 'flags' and 'hoverFlags' as they are defined for the same bits and it makes the code less complicated.
2012-08-17 13:34:14 -07:00
99e339dd40
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-17 18:48:35 +01:00
e9ea911563
adding a clip method to handle Vector3 objects to enable a minor amount of refactoring
2012-08-17 18:40:49 +01:00
f9a318380b
let setLinkPrimParams terminate even if there are no more parts.
2012-08-16 22:14:56 +01:00
998bd48d98
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-16 16:27:01 +02:00
db3f0a3748
fix vs2010 build
2012-08-16 15:26:16 +01:00
d09fa0d76e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-16 16:13:38 +02:00
90ad98370a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
9995421df1
Do a proper null check to avoid the overloaded operator == trap
2012-08-16 02:35:03 +01:00
57a9879669
Correct an exception report in SceneObjectPart so it outputs the stack.
2012-08-15 16:39:00 -07:00
376441e550
BulletSim: make it so objects in a linkset do not generate collisions with each other.
2012-08-15 16:29:50 -07:00
bbac8f76fa
Remove AreUpdatesSuspended flag because it does nothing
2012-08-16 01:18:32 +02:00
b97053269b
Change case of areUpdatesSuspended to upper case as is proper for a property
2012-08-16 01:02:20 +02:00
4e5c19595c
Fix casts and calls for link primitive param setting for avatars
2012-08-16 01:01:03 +02:00
5ac77316e0
Remove XML debug spam from vivox voice
2012-08-16 00:59:58 +02:00
ef4122213c
enables configurable minimum sizes for physical & non-physical prims
2012-08-15 23:35:23 +01:00
e286a95d76
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-15 22:59:31 +01:00
684f8208d9
Do a proper null check to avoid the overloaded operator == trap
2012-08-15 23:58:39 +02:00
0aa1f1cc3f
Implementing PRIM_LINK_TARGET in a non-recursive fashion
2012-08-15 22:58:33 +01:00
5a1b6fdf06
Don't enable the thread watchdog until all regions are ready.
...
This is to avoid false positives when the machine is under heavy load whilst starting up.
2012-08-15 22:43:32 +01:00
c313de630f
Add a real_id field to the login response if impersonation is used. The wrapper
...
script needs this for proper logging.
2012-08-15 23:31:38 +02:00
8cd4042f9e
Implementing PRIM_LINK_TARGET in a non-recursive fashion
2012-08-15 23:51:43 +01:00
7679384829
adding ATTACH_*_PEC constants
2012-08-15 22:06:20 +01:00
dd10cf01e7
BulletSim: add hinge constraint.
...
Update BulletSimAPI with new constraint related function calls.
Reorganize locking in BS6DofConstraint.
Update BS6DofConstraint to do constraint reset correctly.
Add new 'midpoint' construction of 6Dof constraint.
2012-08-15 12:08:21 -07:00
9efe7bf7ba
BulletSim: add locking to constraintCollection and rename some of the public method variables to reduce confusion between a physics scene and the real scene.
2012-08-15 12:08:17 -07:00
68f112888b
BulletSim: clean up detail logging by adding many more debug log statements and then commenting out most of the additions.
2012-08-15 12:08:13 -07:00
b05a2fc4ed
BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. Make sure the collisionCollection is reallocated each tick to fix race condition of it being cleared while still in use.
2012-08-15 12:08:09 -07:00
257446889b
BulletSim: fix problem of a null reference exception on shutdown if there were linksets in the region.
2012-08-15 12:08:05 -07:00
BlueWall