BlueWall
8fe8fdb0c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 05:19:15 -04:00
BlueWall
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
Justin Clark-Casey (justincc)
fbfd28a61b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-06 00:16:40 +01:00
Justin Clark-Casey (justincc)
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
Mic Bowman
641b08aa78
Enables cast from int to float for MOD* functions;
...
Thanks SignpostMarv!
2012-09-05 09:13:16 -07:00
Melanie
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
Melanie
8a537f8f66
Merge branch 'ubitwork' into avination
2012-09-04 13:02:33 +02:00
UbitUmarov
c298ae9e75
bug fix
2012-09-04 10:51:43 +01:00
UbitUmarov
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
UbitUmarov
e1755e2d71
let avatar keep flying in tps to same region. (still bad for other
...
regions )
2012-09-04 04:56:37 +01:00
Melanie
3fb2523f5b
Remove debug spam
2012-09-04 03:20:37 +02:00
Melanie
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
Justin Clark-Casey (justincc)
15d5f3d09d
Bump master code up to 0.7.5 now that 0.7.4 is out.
2012-09-04 00:11:14 +01:00
SignpostMarv
07dbe46ba3
wrapping attachment functions in a region
2012-09-04 00:03:44 +01:00
SignpostMarv
ff867b59cf
Implementing functing to send messages directly to attachments
2012-09-04 00:03:44 +01:00
SignpostMarv
d4b8a13a1d
refactoring the grunt work of MessageObject into a private method with a UUID argument
2012-09-04 00:03:44 +01:00
SignpostMarv
a858c5daee
implementing a function to get the number of attachments worn
2012-09-04 00:03:43 +01:00
SignpostMarv
8d431c6359
formatting
2012-09-04 00:03:43 +01:00
SignpostMarv
663bfbb372
although the attachmentPoint argument is a uint, zero is not a valid attachment point
2012-09-04 00:03:43 +01:00
Melanie
72d20b794a
Revert "made setting rotation match Second Life"
...
This reverts commit f7b88d1c40
.
2012-09-03 21:54:02 +01:00
Melanie
f32c74b2ff
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
.
2012-09-03 21:53:55 +01:00
Melanie
574a6e3580
Revert "formatting"
...
This reverts commit fb211c64fd
.
2012-09-03 21:53:46 +01:00
Melanie
8a42334ff3
Merge branch 'master' into careminster
2012-09-03 21:53:31 +01:00
Melanie
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
Melanie
29218cdb31
Revert "no need to assign rotation to a variable now"
...
This reverts commit a3d140b57c
.
2012-09-03 21:52:03 +01:00
Melanie
359f9efc76
Revert "formatting"
...
This reverts commit fb211c64fd
.
2012-09-03 21:51:54 +01:00
Melanie
96b50d28f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-09-03 14:05:18 +01:00
SignpostMarv
fb211c64fd
formatting
2012-09-03 13:55:41 +01:00
SignpostMarv
a3d140b57c
no need to assign rotation to a variable now
2012-09-03 13:55:40 +01:00
SignpostMarv
f7b88d1c40
made setting rotation match Second Life
2012-09-03 13:55:40 +01:00
Melanie
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
Melanie
e2e8b09059
Merge branch 'master' into careminster
2012-09-02 22:15:55 +01:00
UbitUmarov
63e6666f22
try to reduce potencial recursive locking
2012-09-01 02:05:28 +01:00
UbitUmarov
39f5fd0f58
Merge branch 'avination' into ubitwork
2012-08-31 22:30:33 +01:00
Robert Adams
32b534f324
BulletSim: update the SOs and DLLs
2012-08-31 11:41:39 -07:00
Robert Adams
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
Robert Adams
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
Robert Adams
d3adf9b2b3
BulletSim: fix line endings.
2012-08-31 11:41:23 -07:00
Robert Adams
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
Robert Adams
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
Robert Adams
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
Mic Bowman
2d2495cc45
Remove the unused Newtonsoft.Json dlls
...
Also remove the license files
2012-08-31 11:33:53 -07:00
BlueWall
a0eda6eb16
Fix Windows build
...
Add reference to fix Windows build: no windows here to test, please report any issues back to IRC #opensim-dev ASAP
2012-08-31 13:09:54 -04:00
Melanie
cbdfca1460
Merge branch 'master' into careminster
2012-08-31 15:33:42 +01:00
SignpostMarv
dac31303b7
Type.Type is RuntimeType
2012-08-31 15:33:15 +01:00
Melanie
c0feaf54de
Merge branch 'master' into careminster
2012-08-31 14:40:30 +01:00
Melanie
edd3577b66
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-31 14:34:44 +01:00
SignpostMarv
054db94d5d
formatting
2012-08-31 14:32:33 +01:00
SignpostMarv
794c5f5a6d
adding support for static method script invocations
2012-08-31 14:32:33 +01:00
SignpostMarv
b625579780
moving assignment to new line to make next commit easier to read in diffs
2012-08-31 14:32:33 +01:00