Melanie
d734c1985c
Merge branch 'ubitwork' into avination
2012-09-08 18:03:17 +02:00
UbitUmarov
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
SignpostMarv
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
Justin Clark-Casey (justincc)
fa3edcf55c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-08 00:17:57 +01:00
SignpostMarv
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
Robert Adams
d8df2d6bed
BulletSim: update the DLLs and SOs
2012-09-07 16:05:34 -07:00
Robert Adams
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
Robert Adams
3c097cb7a9
BulletSim: Add some comments (gasp) and log messages.
2012-09-07 16:05:22 -07:00
Robert Adams
189f51233e
BulletSim: PhysicsActorType() now returns the correct value rather than 'unknown'.
2012-09-07 16:05:16 -07:00
Robert Adams
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
SignpostMarv
df3914c7cd
renaming to markdown file
2012-09-08 00:02:27 +01:00
SignpostMarv
740eac192b
multi-paragraph list item
2012-09-08 00:02:27 +01:00
SignpostMarv
783ecd01f4
headers
2012-09-08 00:02:26 +01:00
SignpostMarv
a0e3e23aa9
removing redundant header; this is the building.txt file for opensim
2012-09-08 00:02:26 +01:00
SignpostMarv
1acee36822
code blocks
2012-09-08 00:02:26 +01:00
SignpostMarv
ac90322f1b
markdown-formatted link
2012-09-08 00:02:26 +01:00
SignpostMarv
2ca93cb144
renaming to markdown file
2012-09-08 00:02:26 +01:00
SignpostMarv
4e2805496c
header syntax
2012-09-08 00:02:26 +01:00
SignpostMarv
46af3a3d92
casing
2012-09-08 00:02:26 +01:00
Melanie
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
Melanie
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
BlueWall
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
BlueWall
0199abd625
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-07 11:43:22 -04:00
BlueWall
550f6c4ad2
Revert "Move addin information to RegionCombinerModule.addin.xml"
...
This reverts commit ab446bc692
.
Need to look into this
2012-09-07 11:41:47 -04:00
Diva Canto
2b506cffb1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-07 08:10:03 -07:00
Diva Canto
33469a0d2b
Moved the new vars in Robust.HG.ini to the proper section.
2012-09-07 08:09:44 -07:00
BlueWall
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
BlueWall
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
UbitUmarov
71d2d327d0
One more redundante ParcelProprieties on login
2012-09-07 12:50:38 +01:00
UbitUmarov
c83dd021f3
stop sending duplicated parcelProprieties at login
2012-09-07 11:37:51 +01:00
UbitUmarov
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
d2b00749ef
Add missing DynamicTexture.cs file from last commit
2012-09-06 23:14:48 +01:00
Justin Clark-Casey (justincc)
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
Diva Canto
9f914327c6
Added missing configs, and deleted the [Profile] part on the Hypergrind config.
2012-09-06 12:42:14 -07:00
UbitUmarov
f53ca6285b
Prevent double slashes, try #4
2012-09-06 18:41:21 +01:00
Melanie
ac6448810e
Prevent double slashes, try #3
2012-09-06 17:39:30 +02:00
Melanie
3257f4d5d2
Revert "Change string concatenation to Path.Combine to eliminate extra slashes."
...
This reverts commit b9d026666d
.
2012-09-06 17:31:41 +02:00
Melanie
012f299052
Merge branch 'ubitwork' into avination
2012-09-06 17:12:42 +02:00
Melanie
b9d026666d
Change string concatenation to Path.Combine to eliminate extra slashes.
...
Windoze barfs on them.
2012-09-06 17:11:44 +02:00
Melanie
27d345c9a0
Revert " remove extra '/' in assets url"
...
This reverts commit 041fcd6a72
.
2012-09-06 17:02:55 +02:00
UbitUmarov
041fcd6a72
remove extra '/' in assets url
2012-09-06 17:18:34 +01:00
SignpostMarv
4215877b48
adding utility method for getting SceneObjectGroup from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:56 -04:00
SignpostMarv
d2e79e26d7
adding utility method for getting SceneObjectPart from scene
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:32:46 -04:00
SignpostMarv
3f6c6eed33
pasting in show uptime code
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-09-06 06:13:07 -04:00
BlueWall
0a71e3ab39
Add file to .gitignore
...
Add OpenSim.userprefs which is created by Monodevelop to .gitignore
2012-09-06 05:36:00 -04:00
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