92d44446fa
*feature test* ubitode, let convex hull shape type work for prims other
...
than uploaded meshs, making it change the mesh level of detail from high to low.
This will work on all prims that get a internal mesh or sculpts. Mesh size
reduction will depend on particular shape. This is not as SL. There prims
do also get concave areas. Uploaded meshs work as before. A normal 10x10x10 torus gets 152 vertices in place of 900, and 198 faces in place of 1198.
2012-08-04 17:33:14 +01:00
8ad1d79003
fix build on win
2012-08-04 11:07:30 +01:00
dfb77330a8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
2012-08-04 11:42:59 +02:00
1b7a720b9f
update ode.dll for windows so both 32b and 64b are now version 0.12 (32b
...
is just a rebuild)
2012-08-04 10:36:50 +01:00
b9c4a637b4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-08-04 03:00:20 +01:00
374ebab574
Strip experimental tag from --publish option of "save oar" region console command
2012-08-03 23:54:17 +01:00
fb91ca6f1d
Fix old regression that stopped saving parcel owner data in OARs.
...
This was working in 0.7.2 but was accidentally removed from 0.7.3.
The --publish option for "save oar" will now save oars stripped of parcel owner information as well as scene object info.
Please use the --publish option if you want to publish oars that may be later loaded by others to the same grid from which they were saved.
2012-08-03 23:49:34 +01:00
2724cf685e
Fix build break.
2012-08-03 23:13:19 +01:00
8730dc9d6a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-03 15:10:55 -07:00
d5cd60131f
BulletSim: update DLLs and SOs
2012-08-03 15:10:00 -07:00
e7ad6ed3a3
BulletSim: pass collision subscription information to the C++ code so collisions on objects that don't care are not reported up.
2012-08-03 15:09:56 -07:00
ea36d4a4cf
BulletSim: Add AddObjectForce to BulletSim API.
...
Add interface 2 enhancements to BSCharacter.
Modify AddForce and SetForce to use the new Bullet interface.
More DetailLog statements for character.
2012-08-03 15:09:52 -07:00
0e3b08fa5b
Update settings loading in AvatarFactoryModule which should have been in last commit 205f2326
2012-08-03 23:09:47 +01:00
205f2326dc
Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket.
...
All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
2012-08-03 23:02:39 +01:00
5914270ff1
Restore SOG constructor chaining removed in recent 513b77b. This is not a functional change.
2012-08-03 22:15:06 +01:00
faffe2f2f9
Fix the recent windows compile error by putting newFont for case "R" in VectorRenderModule inside its own context, rather than disposing of the old font before using it as a prototype for the new.
2012-08-03 22:03:04 +01:00
8327e048b9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-03 21:56:48 +01:00
789e88d8bd
Move previously unadvertised SendPeriodicAppearanceUpdates setting from [Startup] to [Appearance] config section.
...
Add description and default of false (as before) to OpenSimDefaults.ini
If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds.
For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent.
However, this switch will not help with other appearance failure situations (e.g. failure to bake assets).
This setting is experimental but will not have any significant impact on the simulator if turned to true.
2012-08-03 21:36:00 +01:00
5181bdae0a
attempting to fix a build issue
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-08-03 16:14:01 -04:00
03eb2d6bf4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-03 21:20:52 +02:00
b95caaa453
on presence close(), release animator and OnRegionHeartbeatEnd event
2012-08-03 20:13:51 +01:00
7ff812066f
Merge branch 'ubitwork' into avination
2012-08-03 19:53:41 +02:00
eb4c092cac
Merge branch 'careminster' into avination
2012-08-03 16:48:06 +01:00
0c00abcce1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-08-03 16:46:11 +01:00
d259b6e57e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-03 17:27:59 +02:00
0549dde3c6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-03 16:22:34 +02:00
a4c59b1fd2
minor change avoiding a null reference
2012-08-03 15:21:29 +01:00
879d1cefb8
clientview IsActive use is broken. Suspend it's use keeping it true ( to
...
review later)
2012-08-03 15:19:31 +01:00
83deb46032
Make WaitGetScenePresence wait for up to 20 seconds
2012-08-03 16:03:40 +02:00
b8ba224b4f
Remove another superflouous IsActive set
2012-08-03 15:33:30 +02:00
d677db338d
Remove a merge artefaci in IsActive handling and restore commented out correct one
2012-08-03 15:22:53 +02:00
8928b8a730
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-03 11:42:36 +02:00
513b77b78d
refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.
2012-08-03 02:26:54 +01:00
08ec18f8a3
Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this is already its default value as it's a struct.
2012-08-03 02:08:04 +01:00
cd9fd77e2c
ImprovedTerseObjectUpdate packet does not support shape updates, thus scheduling terse updates will not (and does not) update shape information in the viewer
2012-08-03 01:55:46 +01:00
3460319f1e
Make sure the position of a loggin-in agent is within region boundaries since
...
out of bounds positions cause a rejection of the login.
2012-08-03 02:20:57 +02:00
0588f27d18
Fixed a rare bug that caused Save OAR to fail because it thought it had timed-out
...
The bug manifested as follows: a large world was saved. All the assets were found. But for some unknown reason, the timeout timer was restarted. So after 1 minute it closed the Archive Writer, because it didn't receive any more assets during that minute. That caused the OAR to become corrupted because ArchiveWriteRequestExecution.Save() was still running.
2012-08-03 01:12:46 +01:00
72075e68c7
Save membership fee to the database when a group is created.
2012-08-03 00:44:03 +01:00
8b04e8a297
BulletSim: Debugging log statements added. Reduced size of updata buffer trying to find a corrupted memory problem. Update DLL and SO.
2012-08-02 16:30:23 -07:00
d58743ddc1
Add a reason message for a code path that lacks one
2012-08-03 01:30:05 +02:00
293d0cc629
minor: Comment out "Deleting asset" log messages for now
2012-08-03 00:25:22 +01:00
0cd698d82b
Delete old blank SOGSpamTest
2012-08-03 00:23:03 +01:00
eeef9d7e99
Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic textures.
...
The convention is that if an object implements IDiposable() the code must explicitly call Dispose() or call it via the using statement.
This may be particularly important for GDI+ objects since they encapsulate native code entities.
2012-08-03 00:00:54 +01:00
0dfccfc1d9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-02 23:54:32 +01:00
68406ab8f9
Initialize the Rezzing object to UUID.Zero
2012-08-02 22:34:46 +01:00
86b005de1d
Add simple draw test for the VectorRenderModule
2012-08-02 22:14:09 +01:00
cd2c5843a8
reduced-complexity implementation of function to get rezzing object key
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-08-02 22:12:36 +01:00
254d3e1ad3
merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
bin/Regions/Regions.ini.example
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
2012-08-02 18:21:08 +02:00
3d68d1deda
i local libs commit
2012-08-02 18:13:59 +02:00
ecffcf7f65
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2012-08-01 23:03:03 +01:00
UbitUmarov