926c0b90a1
Release http-in URLs when llResetScript is called
2012-08-07 20:48:22 +01:00
85b4eab005
Merge branch 'master' into careminster
2012-08-07 20:20:28 +01:00
0e343d6785
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-07 18:43:28 +02:00
eef6bb97c0
use a bit more complex mesh key identifier, plus a bug fix
2012-08-07 17:42:29 +01:00
4adb3471ac
BulletSim: update SOs and DLLs to run on more Linux versions. Correct multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
2012-08-06 12:55:52 -07:00
ba5a2dc7b3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-06 12:05:17 +02:00
df2f9b1885
*** TESTTTTT ** downgrade from .net 4.0 to .net3.5
2012-08-06 11:04:29 +01:00
4ae3536066
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-06 10:11:34 +02:00
36a1248b31
** DANGER someone should stress test more ** release unused physics meshs, including unmanaged memory allocations (allocated by managed code)
2012-08-06 09:06:46 +01:00
e5cce8468e
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-05 14:00:00 +02:00
307c45af2a
bug fix: keep sculpt bitmaps border pixels during resolution scaling.
...
let this eventually have diferent interpolator last steps on each direction as sl seems to do.
2012-08-05 12:54:34 +01:00
dba37c8d45
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-05 11:41:26 +02:00
493309d91a
ubitmeshing: mask out mirror and invert bits on sculpttype convertion.
...
Remove some unused
2012-08-05 10:37:25 +01:00
8d5cce3138
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-08-04 18:59:08 +02:00
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
Melanie