Commit Graph

21086 Commits (4737839b3aa7aa4e207020fac4e73fedd59f7b70)

Author SHA1 Message Date
ubit 4737839b3a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-11-04 16:00:41 +01:00
UbitUmarov 1090ff7278 removed potencial null refs and rearrange code a bit 2012-11-04 14:57:27 +00:00
ubit b30ae054dd Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-11-02 18:51:50 +01:00
UbitUmarov e642b80a79 actually remove the use of random on persist timmings 2012-11-02 17:49:54 +00:00
UbitUmarov b8c19fe1a9 Create a new random when needed using normal time based seed instead of
reusing a shared one than may not be valid
2012-11-02 17:40:17 +00:00
ubit 458e00e204 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-11-02 15:05:26 +01:00
UbitUmarov e36a700eb0 add debug position on bad primmesh error 2012-11-02 14:02:57 +00:00
ubit 4565f05301 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-11-02 11:21:25 +01:00
UbitUmarov c2639bef8e lock unique and uniqueReleased in same order when both locks are needed 2012-11-02 10:14:08 +00:00
UbitUmarov e6c8eca504 Merge branch 'avination' into ubitwork 2012-10-30 19:42:32 +00:00
Melanie dc2c198e5d Set the script state to new rez when a scriptis saved, rather than region start.
Prevents CHANGED_REGION_RESTART being sent to scripts when saving.
2012-10-28 19:09:14 +01:00
Melanie 1a34f42426 Add a property to determine if a link set is stored in the database. Also, fix
a bug where "Force object permissive" god action would fail to reset child prim
permissions.
2012-10-28 18:34:57 +01:00
Melanie 0d00b97aec Deep copy the collection of at_target objects so it can't be modified while
it's being iterated
2012-10-28 18:45:16 +00:00
ubit 707fa2bdb9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 15:42:51 +01:00
UbitUmarov db7f4074b5 revert last change 2012-10-28 14:39:04 +00:00
ubit 1bcecdaf30 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 15:34:54 +01:00
UbitUmarov fbe4ec8ee0 fix ode timing 2012-10-28 14:32:55 +00:00
ubit c513a3db59 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 15:05:39 +01:00
UbitUmarov dd0323d89e minor change 2012-10-28 14:04:39 +00:00
ubit 42479590f0 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 12:56:09 +01:00
UbitUmarov 8bb2905416 test limit ode exec time by time not number of loops done 2012-10-28 11:55:11 +00:00
ubit e0510203f9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 11:26:31 +01:00
UbitUmarov ad7f273d95 more debug 2012-10-28 10:25:58 +00:00
ubit 3aff65e9a6 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 10:58:58 +01:00
UbitUmarov e297e90bda remove pre physics build testing 2012-10-28 09:57:41 +00:00
ubit 3ac8461d3f Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 10:54:40 +01:00
UbitUmarov aa97014ee4 Add some extra debug on scene close 2012-10-28 09:51:27 +00:00
ubit 3212bcff59 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-20 18:55:44 +02:00
UbitUmarov 3b51cae958 bug fix 2012-10-20 17:53:33 +01:00
ubit a936b9b7d3 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-19 04:53:22 +02:00
UbitUmarov b51c26ab40 UbitOde stop doing a copy of the asset data using just the reference to
it. It costs a lot of cpu and doesn't seem all that usefull.
2012-10-19 03:50:00 +01:00
UbitUmarov 739782627a [UNTESTED] core Ode: let broken mesh physical prims collide with land as
the defaul basic box so they don't go off world.
2012-10-19 01:25:30 +01:00
UbitUmarov 33a67b691e [UNTESTED] core Ode: stop trying to load a broken asset. Make broken
assets behave like phantom by Nebadon request
2012-10-19 00:36:32 +01:00
Melanie 453192d721 Merge branch 'ubitwork' into avination 2012-10-19 01:02:07 +02:00
Melanie 8ce7ab721d Merge branch 'ubitwork' into avination 2012-10-19 00:12:30 +02:00
ubit c9cbdc5eaf Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-18 16:36:02 +02:00
UbitUmarov 7228ad7a51 extend coment to include all unused SOG CheckSculptAndLoad() 2012-10-18 15:30:42 +01:00
Melanie 2e8e8d576e Remove redundant and annoyingly modal message box in upload processing. 2012-10-18 13:20:50 +02:00
Melanie 0ca9666932 Merge branch 'ubitwork' into avination 2012-10-17 20:46:38 +02:00
Melanie 322eefbb6f Allow the console to be used by gods as well as region owners. 2012-10-17 01:31:05 +02:00
ubit 513e63c95a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-16 12:40:31 +02:00
UbitUmarov e8936366f5 coment a debug warning 2012-10-16 11:39:58 +01:00
ubit 10ed5b08c7 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-16 12:27:37 +02:00
UbitUmarov 91b83fd45e fixes 2012-10-16 11:26:05 +01:00
Melanie aba078c93f Fix perms when linking an object. Set root part perms to the perms
of the link set to make the build floater behave consistently.
Fixes permissions exploit introduced on 23 August.
2012-10-14 17:32:46 +02:00
Melanie ce26730d4e Allow bypassing perms dialog (console only) 2012-10-14 17:31:29 +02:00
Melanie de3ff44406 Make texture sedning use only two threads to make things less harsh on bandwidth 2012-10-14 17:10:26 +02:00
ubit 7040c0aa5a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-13 23:45:58 +02:00
UbitUmarov 1e03344411 missing file 2012-10-13 22:45:09 +01:00
ubit 0886d99f1b Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-13 23:37:25 +02:00