Commit Graph

11843 Commits (fd4a059e9bf0beda9907e90da8c78cc48d88eb98)

Author SHA1 Message Date
Thomas Grimshaw fd4a059e9b Merge branch 'master' of ssh://TOR/var/git/careminster 2010-04-05 23:17:31 +02:00
Thomas Grimshaw 2f454843d8 Fix up my own shoddy code! Fixes prim rez break. Whups! 2010-04-05 23:17:06 +02:00
Melanie Thielker a573b5767b Test commit 2010-04-05 22:31:30 +02:00
Melanie Thielker 5c04d768a6 Bump version number 2010-04-05 22:26:18 +02:00
Thomas Grimshaw 07b4889eab Merge branch 'master' of ssh://TOR/var/git/careminster 2010-04-05 22:11:11 +02:00
Thomas Grimshaw 7a3bb266eb This commit adds some randomness to object persistence. It's a Work In Progress, I am working on improving this to a tiered approach. 2010-04-05 22:11:05 +02:00
Thomas Grimshaw f34cc6b469 Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 so it can be reverted then. 2010-04-05 22:08:34 +02:00
Melanie 2fbbc13c71 Fix some overlooked merge conflicts that got committed 2010-04-05 19:42:15 +01:00
Melanie f505c1d0a4 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2010-04-05 18:10:49 +01:00
Melanie 04a68db195 Merge branch '0.6.9-post-fixes' into careminster 2010-04-05 18:10:36 +01:00
lcc 956225f0e1 Fixed Ban and parcel exclusion. Need to fix the parcel chat too 2010-04-04 18:29:18 +02:00
Justin Clark-Casey (justincc) 18ed68cd31 add nant distbin target
this will delete all extraneous source code files and copy OpenSim.ini.example to OpenSim.ini
2010-03-26 20:47:26 +00:00
Justin Clark-Casey (justincc) 4d712ddaae comment out very probably unused dist and distdir nant targets 2010-03-26 19:36:21 +00:00
Justin Clark-Casey (justincc) dd544f811a switch flavor to RC1 2010-03-26 19:09:09 +00:00
Melanie Thielker e0b287961f Change land overlay to send group owned status properly 2010-03-23 17:04:37 +01:00
Kitto Flora add47befac Update acceleration to 0 on no tphysical. 2010-03-19 18:53:16 -04:00
Kitto Flora 0e36994fe7 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-03-19 13:27:12 -04:00
Kitto Flora 3ea72eeabb Fix sit with autopilot. 2010-03-19 13:26:34 -04:00
Melanie 1a2cbbc8c1 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2010-03-18 18:58:44 +00:00
Melanie f35eb8819c Unify a previous refactor of object return with the older solution. We
really don't need two methods doing the same thing, but differently.
2010-03-18 18:58:37 +00:00
Thomas Grimshaw e442c2a3f9 Prevent llTeleportAgentHome from affecting gods 2010-03-17 17:42:33 +01:00
Thomas Grimshaw 37815f3402 Debugger tags for VS2010 2010-03-16 18:13:00 +01:00
Kitto Flora 8cbd0d3b5f Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-03-14 16:23:12 -04:00
Kitto Flora 8198062610 RotLookAt repaired; debug msg cleanup. 2010-03-14 16:22:13 -04:00
CasperW 80e4068b3e Fix the delay in llGiveInventory so that it only takes effect when giving inventory to an avatar (this now replicates SL behaviour) 2010-03-13 15:13:19 +01:00
Kitto Flora 1379ae4310 Fix Rotation Lock. NOTE: This version had poor border crossing control 2010-03-12 16:13:52 -05:00
Kitto Flora 7bd48d383d Resolved merge 2010-03-12 13:48:31 -05:00
Kitto Flora f6f6ef1532 Dynamics Integration Part 1 2010-03-11 19:12:38 -05:00
Justin Clark-Casey (justincc) 4423630f1e remove milliseconds from console log again 2010-03-09 18:56:32 +00:00
Justin Clark-Casey (justincc) 5caae0293a Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.

Backport from head.
2010-03-09 18:53:04 +00:00
Melanie c8c608acc8 Small consistency change 2010-03-07 16:07:40 +00:00
Melanie 3d053b194a Small consistency change 2010-03-07 16:06:52 +00:00
Melanie 2fdd535302 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2010-03-06 12:24:26 +00:00
Melanie 1f7a0cf892 Merge branch '0.6.9-post-fixes' into careminster 2010-03-06 12:24:09 +00:00
unknown 83929c69e3 - implementing server 1.38 functions
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:59:16 +00:00
Kitto Flora 87590491b5 Fix Physics angular reference frame. 2010-03-04 16:33:26 -05:00
Melanie 62dd83f473 Remove a superfluous array creation 2010-03-04 10:47:16 +00:00
Melanie 84b0a23e19 Remove a superfluous array creation 2010-03-04 10:45:46 +00:00
Jeff Ames 780ee4f991 Fix a few compiler warnings. 2010-03-01 23:04:45 +09:00
Jeff Ames a5f78ac604 Formatting cleanup. 2010-03-01 11:59:22 +09:00
Justin Clark-Casey (justincc) 93967d4a1c fix bug where region settings loaded via an oar (water height, terrain textures, etc.) were not being persisted to the database
this meant that the loaded settings would disappear after a restart
2010-02-26 18:30:05 +00:00
CasperW 393a782858 Fix the crashed session notification from the userserver. 2010-02-25 18:05:30 +01:00
CasperW 7f61de8f57 Allow particles and texture anims to be persisted to XML. This behaviour is expected. 2010-02-25 14:14:53 +01:00
CasperW e99341d7df llDie() should not work on attachments (results in an incosistent attachment state) 2010-02-25 12:07:56 +01:00
CasperW efd4810851 Disable blocking teleports within the same parcel for now; it's not implemented correctly. Will review soon. 2010-02-25 12:04:51 +01:00
dahlia e635570cf3 minor formatting tweak - try to trigger a build on panda 2010-02-22 02:13:01 -08:00
dahlia 03706e3f08 add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitive 2010-02-22 01:15:12 -08:00
Jeff Ames e6c869ddfc Minor formatting cleanup. 2010-02-22 13:18:11 +09:00
Jeff Ames 300f4c58a6 Separate PhysX classes into separate files. 2010-02-22 13:16:40 +09:00
Jeff Ames 2dea162073 Formatting cleanup. 2010-02-22 12:25:59 +09:00