Commit Graph

8776 Commits

Author SHA1 Message Date
meta7
9fba4b66bb Resolve merge failure 2010-08-10 09:11:55 -07:00
Melanie
5e8c3f8325 Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-10 20:12:13 +01:00
sacha
7fead01786 remoning debug messages 2010-08-10 19:43:32 +00:00
sacha
d0a22fb359 fixed ground texture issues ( it seems ) 2010-08-10 19:35:17 +00:00
Melanie
24b9a2885f Resolve merge issues 2010-08-10 20:11:55 +01:00
Melanie
c2e5d1d203 Merge branch 'master' into careminster-presence-refactor 2010-08-10 19:49:35 +01:00
Melanie
383ee0d647 Remove 4000+ DOS line endings. Grrr! 2010-08-10 19:48:45 +01:00
Melanie
d98d5ee6be Remove windows line endinge 2010-08-10 19:42:18 +01:00
Marck
4f62f00ca0 Changing prim color generates event CHANGED_COLOR.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:38:39 +01:00
Mikko Pallari
3f942a4f74 Removed abstract SetText method from EntityBase to make cleaner API.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:37:15 +01:00
Melanie
75f92faeb4 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-08-10 19:34:57 +01:00
Justin Clark-Casey (justincc)
158604a733 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-08-10 20:17:47 +01:00
Justin Clark-Casey (justincc)
2a1c11fda9 On shift-copy of an object, set up a new physics actor (as appropriate) for every copied prim, not just the root
This addresses http://opensimulator.org/mantis/view.php?id=4295
2010-08-10 20:15:44 +01:00
Marck
6147efdad9 Avoid truncation of error message during region creation.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:34:09 +01:00
Diva Canto
a299fa4849 This file wants to be committed 2010-08-10 11:18:39 -07:00
Justin Clark-Casey (justincc)
0a81038dd5 Reduce number of paths in SOP code by setting flags via Flags property rather than _flags
Both ObjectFlags and Flags are effectively exactly the same property, except that ObjectFlags is uint and Flags is PrimFlags
Both reference the PrimFlags _flags underneath, so you couldn't set a non PrimFlags uint anyway.
Deprecated ObjectFlags in favour of Flags.
2010-08-10 17:26:31 +01:00
meta7
1ead2ed5ee Add a stack trace to the error output on the recursive read lock warning on my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into. 2010-08-10 09:07:17 -07:00
Justin Clark-Casey (justincc)
7203feb83c Extend DuplicateObject() test to check flags on the duplicated object 2010-08-10 16:50:36 +01:00
Justin Clark-Casey (justincc)
85fc2dfe3c extend TestDuplicateObject() to a two prim object 2010-08-10 16:16:57 +01:00
Justin Clark-Casey (justincc)
a5dab074a0 Handle incoming ObjectImage (TextureEntry) updates synchronously rather than asynchronously
At least on stock Linden clients, updating the texture on all faces of the prim will actually send an ObjectImage packet for each update.
There is a race condition if these are handled async, meaning that occasionally not all of the faces are correctly updated.
2010-08-10 16:00:35 +01:00
meta7
912bfba20c Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-09 23:36:59 -07:00
meta7
eb5c508f8b Add a DebuggerSafe option to the ini to help with debugging in visual studio. This essentially silences exceptions in the script engine. Disabled by default, naturally. 2010-08-09 23:35:40 -07:00
meta7
f0bad66d41 For my own sanity, fix a bug in xengine 2010-08-09 23:34:37 -07:00
Melanie Thielker
0f9eebdfb1 Change prejump from hardcoded true to default true so it can be disabled.
It completely destroys roleplay jumping
2010-08-10 03:52:00 +02:00
Melanie Thielker
f20dc512e8 Whitespace conflict 2010-08-09 02:46:09 +02:00
meta7
680e801bf2 Print a console message when we deny access because of no valid parcel found. 2010-08-08 17:32:20 -07:00
meta7
603b3a1606 Fix minimap issues. This addresses mantis #228. 2010-08-08 17:31:29 -07:00
Melanie Thielker
ca2a4bbded Add debug messages to attachment receiving and cowardly refuse to create
them if the owner can't be determined.
2010-08-08 19:35:20 +02:00
Melanie
321e1148da Merge branch 'master' into careminster-presence-refactor 2010-08-08 18:24:33 +01:00
Marck
f216fd8136 Tests for distance-sorted fallback regions.
With some extensions to existing grid service tests.
2010-08-08 18:12:07 +01:00
meta7
a1f2be5e69 The real fix for unscripted sit positions. This one doesn't fuck everything else up. Promise. 2010-08-07 22:25:37 -07:00
meta7
f9b5f23383 Reverted: * Fix the unscripted sit rotation being incorrect .. will commit a proper fix now. 2010-08-07 22:19:26 -07:00
meta7
12dd97c9f8 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-07 20:14:58 -07:00
meta7
0794c6a941 Implement parcel group access control. This addresses mantis #158. 2010-08-07 20:13:45 -07:00
Melanie
cd2c7b9ac9 In my crusade against facelights, I am striking the killing blow. Add a
DisableFacelights option to OpenSim.ini to finally kill those immersion-
breaking, silly vanity lights that destroy nighttime RP. Girls, you look
just fine without them. Guys, you too. Thank you. Melanie has left the building.
2010-08-08 01:57:02 +01:00
meta7
aa54e8d95e Increase sit distance to 256 meters, but leave the initial autopilot process in the picture so sit position can still be raycast by the existing code. 2010-08-07 17:35:16 -07:00
meta7
b771965f28 Get rid of some debug chatter that someone who can't spell left behind. ;) 2010-08-07 17:33:27 -07:00
meta7
acb1590cf0 Fix the unscripted sit rotation being incorrect (relative to the prim). Note that unscripted sit offset is still really poor but this is not something i'm prepared to spend time on fixing. 2010-08-07 17:32:36 -07:00
Melanie Thielker
d2b3d45d76 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-08 02:04:37 +02:00
Melanie Thielker
50ac61e17f In my crusade against facelights, I am striking the killing blow. Add a
DisableFacelights option to OpenSim.ini to finally kill those immersion-
breaking, silly vanity lights that destroy nighttime RP. Girls, you look
just fine without them. Guys, you too. Thank you. Melanie has left the building.
2010-08-08 02:01:24 +02:00
meta7
19ab4c9508 Fix a rather nasty issue where the Backup() process causes objects and avatars sitting on them to be pushed to the corner of the sim. 2010-08-07 16:52:03 -07:00
meta7
8d3a73d126 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-07 16:32:18 -07:00
meta7
a6048518b7 Repair lsGetWindlightScene, the constant was added to the list as a uint, which is bad - convert to LSL_Integer first. 2010-08-07 16:18:44 -07:00
Justin Clark-Casey (justincc)
903cfa8c7e minor: Remove overly verbose schedule full update log message for attachments 2010-08-07 22:28:42 +01:00
Melanie
68e4b1115a Dumb error in fix 2010-08-07 22:23:51 +01:00
Melanie Thielker
71f2cec1bd Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-07 22:11:18 +02:00
sacha
4900d39b7d Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-07 21:05:18 +00:00
sacha
478d835392 removing more stains ... 2010-08-07 21:04:16 +00:00
Melanie Thielker
7bac069976 Mantis #229. Fix Global sim ccordinates 2010-08-07 22:10:46 +02:00
meta7
cabbd187e7 Fix the distance from which autopilot is negated when sitting on an unscripted prim - and also add some more Velocity code to ensure it gets set to zero in all cases 2010-08-07 11:13:05 -07:00