158604a733
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-10 20:17:47 +01:00
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
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
a299fa4849
This file wants to be committed
2010-08-10 11:18:39 -07:00
7741143fb5
Enforce DB limits on region name to 32 chars, or else (not good). Removed a piece of code from Hyperlinker that didn't work anyway. Shortened the hyperlink region name.
2010-08-10 11:17:38 -07:00
1582e05ac7
Fix a nullref issue in the AgentSetAppearance packet handler when removing the physactor from the scene
2010-08-10 09:55:40 -07:00
48c52d6e48
Fix a dangling lock issue in llRemoveInventory
2010-08-10 09:50:18 -07:00
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
fb14390fb0
Note to self: don't break the build
2010-08-10 09:17:30 -07:00
9fba4b66bb
Resolve merge failure
2010-08-10 09:11:55 -07:00
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
7fead01786
remoning debug messages
2010-08-10 19:43:32 +00:00
d0a22fb359
fixed ground texture issues ( it seems )
2010-08-10 19:35:17 +00:00
24b9a2885f
Resolve merge issues
2010-08-10 20:11:55 +01:00
c2e5d1d203
Merge branch 'master' into careminster-presence-refactor
2010-08-10 19:49:35 +01:00
383ee0d647
Remove 4000+ DOS line endings. Grrr!
2010-08-10 19:48:45 +01:00
d98d5ee6be
Remove windows line endinge
2010-08-10 19:42:18 +01:00
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
7203feb83c
Extend DuplicateObject() test to check flags on the duplicated object
2010-08-10 16:50:36 +01:00
85fc2dfe3c
extend TestDuplicateObject() to a two prim object
2010-08-10 16:16:57 +01:00
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
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
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
f0bad66d41
For my own sanity, fix a bug in xengine
2010-08-09 23:34:37 -07:00
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
3b26baf282
Even if all data migratios are up to date, still print the current revision to the log
2010-08-09 22:54:13 +01:00
bef6fa37b9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-08 18:57:16 -07:00
32ccc19a62
Make fallbacks work, the destination was never actually updated with the fallback details.
2010-08-08 18:56:47 -07:00
144fc20e87
Make fallbacks work, the destination was never actually updated with the fallback details.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-09 02:23:59 +01:00
f20dc512e8
Whitespace conflict
2010-08-09 02:46:09 +02:00
1f052520ae
Merge branch 'master' into careminster-presence-refactor
2010-08-09 02:27:54 +01:00
680e801bf2
Print a console message when we deny access because of no valid parcel found.
2010-08-08 17:32:20 -07:00
603b3a1606
Fix minimap issues. This addresses mantis #228 .
2010-08-08 17:31:29 -07:00
b0795bcfef
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-09 00:49:40 +01:00
52f49b2a78
Merge branch 'master' into careminster-presence-refactor
2010-08-09 00:49:15 +01:00
bc7ee7ba88
Remove "Could not authorize your session into the region" message in favor
...
of sending back the actual error message provided by the sim.
2010-08-09 00:48:08 +01:00
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
321e1148da
Merge branch 'master' into careminster-presence-refactor
2010-08-08 18:24:33 +01:00
a5e4a2bb3b
Add distance sort for null, too
2010-08-08 18:18:42 +01:00
f216fd8136
Tests for distance-sorted fallback regions.
...
With some extensions to existing grid service tests.
2010-08-08 18:12:07 +01:00
af261ff758
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-08 17:39:26 +01:00
a87dbe198c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-08 09:51:17 -07:00
1314c87f36
Enabled GridInfoServiceInConnector for standalones.
2010-08-08 09:50:41 -07:00
1f25b9e8db
Thank you, Marck00, for a patch that implemented region distance sorting
...
for fallback regions. Applied with changes.
2010-08-08 17:37:50 +01:00
6cb50c49b5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-08 17:53:25 +02:00
1cde77293e
Thank you, Marck00, for a patch that implemented region distance sorting
...
for fallback regions. Applied with changes.
2010-08-08 17:51:43 +02:00
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
f9b5f23383
Reverted: * Fix the unscripted sit rotation being incorrect .. will commit a proper fix now.
2010-08-07 22:19:26 -07:00
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
0794c6a941
Implement parcel group access control. This addresses mantis #158 .
2010-08-07 20:13:45 -07:00
Justin Clark-Casey (justincc)