BlueWall
a6e5a2f4df
Prebuild fix
...
Had moved the class to a different namespace but failed to add the reference
2012-12-07 19:41:07 -05:00
BlueWall
cba1390ffd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-07 16:56:03 -05:00
UbitUmarov
c73c2fb070
add some default size setting and checks
2012-12-07 21:53:33 +00:00
UbitUmarov
93bede4e6a
revert the use of avatar skeleton and use avatar size provided by viewers,
...
since at least for now seems good enought
2012-12-07 21:26:58 +00:00
Diva Canto
16d18afe21
Added missing config var in grided sims.
2012-12-07 12:38:19 -08:00
BlueWall
0b455d2882
Merge branch 'master' into connector_plugin
2012-12-07 15:36:43 -05:00
UbitUmarov
2ea0dc55d7
create a new ode character also with the new information
2012-12-07 20:06:35 +00:00
UbitUmarov
b2f3516b68
calculate avatar size on tps
2012-12-07 17:28:07 +00:00
UbitUmarov
d2499c4c31
*TEST* Use new avatar size in ubitODE.
2012-12-07 15:54:46 +00:00
UbitUmarov
1eddc4a9da
fix regression
2012-12-07 14:01:22 +00:00
UbitUmarov
135e0ea853
*TEST* add some avatar skeleton information and use it to calculate avatar
...
height and bounding box. Change LSL acording.
2012-12-07 13:47:58 +00:00
Diva Canto
3c9f8c9c46
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-06 20:04:59 -08:00
Diva Canto
8b29db98bd
Trying to prevent old route of sending attachments, simulator version unknown maybe due to timeout. mantis #6450
2012-12-06 20:04:32 -08:00
Melanie
2cb824d3fc
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-12-07 03:49:04 +00:00
Justin Clark-Casey (justincc)
4e622f6816
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-07 00:53:47 +00:00
Justin Clark-Casey (justincc)
0568c76a88
Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the aim of avoiding OpenSimulator problems due to script thread aborts.
...
When an object is removed, its scripts are stopped and then the thread running them is aborted if stop takes too long.
However, it appears that aborting a thread at just the wrong moment when it is obtaining a ReaderWriterLockSlim lock can leave this lock in an inconsistent state.
One symptom of this is that mono leaps to 100% cpu and a vm thread dump reveals lots of threads waiting for a ReaderWriterLockSlim lock without any thread actually holding it.
This is probably the same problem as encountered originally in commit 12cebb12
This commit looks to plaster this problem by putting lock obtaining methods inside finally blocks which should be uninterruptible by thread aborts.
2012-12-07 00:47:04 +00:00
Robert Adams
707e186aa3
BulletSim: update DLLs and SOs with vehicle collision event check
2012-12-06 09:34:30 -08:00
Robert Adams
7fd8202ae3
BulletSim: rewrite and improve vehicle angularDeflection, verticalAttraction,
...
linearMotorUp and related vehicle forces.
Fixed problems with downward vehicle position correction forces being too large.
Add vehicle collision flag so can sense whether vehicle is on the ground.
2012-12-06 09:31:12 -08:00
Robert Adams
edd1b353a5
BulletSim: update and add to the TODO list.
2012-12-06 09:31:05 -08:00
Robert Adams
18fe35906d
BulletSim: add detail logging detail flag so I don't have to comment and uncomment the detail logging when changing the depth of logged info.
2012-12-06 09:30:57 -08:00
Robert Adams
cc59e3cbdf
BulletSim: only check position sanity if the prim is physical -- the user can do anything dumb they wish.
2012-12-06 09:30:50 -08:00
Robert Adams
2ecd8e6720
BulletSim: add values for material friction and restitution. Fix line endings in material definition file.
2012-12-06 09:30:42 -08:00
Robert Adams
6d7f66f781
BulletSim: Don't add gravity to down force -- let Bullet do that. Add VehicleAddForce to set of managed vehicle prim properties.
2012-12-06 09:30:35 -08:00
Robert Adams
e599a8b242
BulletSim: Vehicle angular vertical attraction works. Other vehicle angular forces commented out for the moment for debugging.
2012-12-06 09:30:28 -08:00
nebadon
f1d4e8f792
fix openjpeg on 64 bit OSX we were pointing to a file taht did not
...
exist.
2012-12-06 09:52:18 -07:00
Justin Clark-Casey (justincc)
68daeee434
minor: change method doc on GetTextureHandler.TryParseRange(), mainly to trigger another build
2012-12-06 01:36:30 +00:00
Justin Clark-Casey (justincc)
acc01bb85d
Allow GetTexture calls with no second value in the range header (e.g. just 5333-)
...
It looks like the latest Kokua is doing this.
As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html , leaving off the second value is legal
This indicates the caller wants the rest of the entity.
2012-12-06 01:12:12 +00:00
Justin Clark-Casey (justincc)
1c9ecc55d3
Instead of printing script errors out to console, put to debug log so that we also get timestamps.
...
This commit also adds script name, part name, uuid, etc. for later identification.
This information has been sent to console since 2009 but may be turned down if it proves too noisy.
However, I still currently need it to investigate some region problems probably triggered by scripting.
2012-12-06 00:22:52 +00:00
Justin Clark-Casey (justincc)
e60fe958df
minor: Fix more compiler warnings in CoreModules tests by properly overriding OpenSimTestCase.SetUp()
2012-12-05 23:44:12 +00:00
Justin Clark-Casey (justincc)
ec765de7e5
Add engine-wide events queued and events processed numbers to output of "xengine status" console command. For debugging purposes.
2012-12-05 23:41:50 +00:00
Justin Clark-Casey (justincc)
66982c8a59
Remove some mono warnings in script tests, chiefly where SetUp() wasn't properly calling to OpenSimTestCase.SetUp()
2012-12-05 23:36:15 +00:00
Justin Clark-Casey (justincc)
5ba99cbf55
Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking callers to lock and directly inspect the EventQueue
2012-12-05 23:33:48 +00:00
Justin Clark-Casey (justincc)
652f4bcb42
For now, sort "show scripts" output in descending order sorted by events processed.
...
For debug purposes - should later add options to allow different sorting or show only highest 10, etc.
2012-12-05 23:27:50 +00:00
UbitUmarov
de3180a63e
avatar collision plane send to viewer is only relative to feet. change
...
avatar collider, just rounding the boxes, etc
2012-12-05 23:19:18 +00:00
Justin Clark-Casey (justincc)
e8df0f1b4c
Add IScriptInstance.EventsProcessed stat so that we can record this information and display in "show scripts" for debug purposes
2012-12-05 22:33:46 +00:00
Justin Clark-Casey (justincc)
0f3ebe0971
Remove very probably unused PrimitiveBaseShape(bool) constructor to reduce code complexity
2012-12-05 22:12:45 +00:00
Justin Clark-Casey (justincc)
b60c6bc3f8
Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this is ignored by the ExtraParams properly anyway
2012-12-05 22:01:47 +00:00
Justin Clark-Casey (justincc)
2342d20a7e
minor: tidy up spacing at bottom of MundaneFrameworkTests
2012-12-05 21:53:25 +00:00
Justin Clark-Casey (justincc)
fdf8876e20
In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather than creating a new CultureInfo separately
2012-12-05 21:52:10 +00:00
Justin Clark-Casey (justincc)
ea786414c2
In XEngine.DoOnRezScript() use Culture.SetCurrentCulture() instead of constructing a new CultureInfo separately
2012-12-05 21:51:08 +00:00
Justin Clark-Casey (justincc)
d97440c7cf
On XEngine.ProcessEventHandler(), instead of creating a new CultureInfo on every call use the single one set by Culture.SetCurrentCulture()
...
This is slightly different in that SetCurrentCulture() does not use overridden settings if the system culture matches en-US but some settings there have been changed.
This is what we want - we do not want to use any system overriden settings.
2012-12-05 21:40:28 +00:00
Justin Clark-Casey (justincc)
1b5f21f761
minor: also comment out the debug log message which reports searching for child agents in simulator scenes for now.
2012-12-04 23:07:26 +00:00
Justin Clark-Casey (justincc)
0d4047e641
minor: Comment out "Delivering IM to..." messages for now.
2012-12-04 23:06:02 +00:00
Melanie
5837e731bf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
2012-12-04 23:01:18 +00:00
Justin Clark-Casey (justincc)
fb26d32a5c
minor: Put Scene.PhysicsRequestAsset() into standard C# xml format.
2012-12-04 22:33:25 +00:00
Justin Clark-Casey (justincc)
7fdc251774
Add path references for Mono.Addins where they were missing for DataSnapshot and UserStatistics.
...
Should address http://opensimulator.org/mantis/view.php?id=6444
Appears that nant doesn't need these paths but building directly in monodevelop does.
2012-12-04 22:24:51 +00:00
Diva Canto
583e44103c
Bug fix in OfflineMessageModule. Mantis #6446
2012-12-04 08:36:54 -08:00
Diva Canto
a4821c5e01
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-04 08:08:58 -08:00
Diva Canto
dc80c2afb3
Improvement in HGInstantMessageService: account for the existence of an offline IM service.
2012-12-04 08:08:34 -08:00
UbitUmarov
b6d29aa124
move characters (avatars) to own collision space, also fixing a problem
...
with previus code that was still assuming the avatar is g2
2012-12-04 02:46:40 +00:00