Melanie
3dbf754651
Merge branch 'master' into careminster
2012-03-09 23:00:24 +00:00
Melanie
5c5a493791
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-09 22:59:23 +00:00
satguru srivastava
35f2479858
fix for NPC not playing internal animations
2012-03-09 22:58:59 +00:00
Diva Canto
a58152bd2a
More on inventory transfer hold ups:
...
- Added an inventory cache for caching root and system folders
- Synchronized the remote inventory connector, so that all the remote inventory calls are serialized
This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
2012-03-09 12:59:24 -08:00
Diva Canto
81869c4a3f
More on HG inventory transfers. Move the FireAndForget higher up.
2012-03-09 09:48:12 -08:00
UbitUmarov
0e5e324a2c
ubitOde bug
2012-03-09 17:20:49 +00:00
UbitUmarov
e83a2181d0
on linking update linked parts physical flags acording to new parent ones ( untested )
2012-03-09 17:19:10 +00:00
Melanie
09d99cb222
Merge branch 'ubitwork'
2012-03-09 09:47:09 +01:00
UbitUmarov
13f340077c
let chode and ubitode find ode.dll on windows
2012-03-09 04:19:39 +00:00
UbitUmarov
eaef84ad1d
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-09 03:32:49 +00:00
Diva Canto
f545d669de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 19:32:21 -08:00
Diva Canto
7db5ba7702
More on the freeze on HG inventory transfers: spawn a threadlet on the functional asset posts so that the client threads doesn't freeze (but the network posts are serialized).
2012-03-08 19:31:53 -08:00
UbitUmarov
fc4dc7708d
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-09 03:00:31 +00:00
UbitUmarov
e5786ba043
more changes on undo/redo group scaling seems to work better
2012-03-09 02:56:14 +00:00
Justin Clark-Casey (justincc)
06dda14505
Simplify minimap coarse location code by just reference SP.AbsolutePosition
...
This is rather than checking whether the avatar is sitting and doing its own calculation.
2012-03-09 02:50:57 +00:00
Justin Clark-Casey (justincc)
205c36d3a4
Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since this is handled by the necessary ParentPart check
2012-03-09 02:44:08 +00:00
Melanie
dc5f831ca8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-09 02:39:14 +00:00
Justin Clark-Casey (justincc)
94e58ff6b9
Use SP.ParentPart instead of ParentID in places where it's more efficient (saving extra null checks, etc.)
...
However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null.
Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
2012-03-09 02:38:11 +00:00
Justin Clark-Casey (justincc)
b454326273
refactor: cleanup SP.HandleAgentSit so that everything is done within one if (part != null), rather than having unnecessary multiple checks
2012-03-09 02:33:48 +00:00
Diva Canto
c22446ede0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 18:29:08 -08:00
Diva Canto
8a34d1b710
HG inventory/asset transfers: serialize asset posts. I'm using the same pattern as suggested in the patch mantis #5921 . Testing it in this smaller context to see how it works.
2012-03-08 18:28:46 -08:00
Justin Clark-Casey (justincc)
73c47f7205
Remove a race condition from SP.Set_AbsolutePosition where we assume the ParentPart is still not null if the ParentID != 0
...
Another thread could come in and stand the avatar between those two instructions.
2012-03-09 02:22:22 +00:00
UbitUmarov
05cdf9bda9
more changes in undo/redo. Basicly moved control to llclientview.cs. later we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken
2012-03-09 01:53:58 +00:00
Melanie
c521f3b348
Fix UbitODE dll mappping by simply copying the one from ODE.Net
2012-03-09 02:39:02 +01:00
Melanie
e1be1c5263
Merge branch 'ubitwork'
2012-03-09 02:11:25 +01:00
Melanie
99c64f0645
Fix a merge artefact
2012-03-09 02:45:53 +00:00
Melanie
3ae0ae0659
Merge branch 'master' into careminster
2012-03-09 00:59:27 +00:00
Melanie
42a7a85062
FireAndForget scripted rez - port from Avination
2012-03-09 00:57:49 +00:00
Melanie
ac577bf606
Merge branch 'master' into careminster
2012-03-09 00:56:52 +00:00
Justin Clark-Casey (justincc)
df4b06aed1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-09 00:20:10 +00:00
Justin Clark-Casey (justincc)
034c9d6bcc
Merge branch 'xassetservice'
2012-03-09 00:19:42 +00:00
Justin Clark-Casey (justincc)
3c5bd7c35a
minor: move some compression related var setup inside compression if/then switch
2012-03-09 00:16:49 +00:00
Justin Clark-Casey (justincc)
0cbdf9dad2
Put big fat EXPERIMENTAL warning in xassetservice database plugin
...
This should not currently be used in any circumstances except for experimentation.
Database tables used by this plugin can still change at any time with no migration path.
2012-03-09 00:05:34 +00:00
Diva Canto
9c8ef96301
Fixes mantis #5923
2012-03-08 15:55:43 -08:00
Melanie
6d1888792b
Merge branch 'master' into careminster
2012-03-08 19:14:45 +00:00
Melanie
675d40357c
Hold a ref to the prim we're sat on rather than querying scene each time
...
the check for significant is carried out. Prevents a deadlock condition.
2012-03-08 19:14:34 +00:00
Melanie
b0fc96c17d
Merge branch 'master' into careminster
2012-03-08 19:10:22 +00:00
Melanie
3089344114
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-08 19:09:11 +00:00
Melanie
b8c27252c1
Hold a ref to the prim we're sat on rather than querying scene each time
...
the check for significant is carried out. Prevents a deadlock condition.
2012-03-08 18:31:58 +01:00
Justin Clark-Casey (justincc)
fa2a64564a
Move "change region" command into general category
2012-03-08 02:24:37 +00:00
Justin Clark-Casey (justincc)
dfdb0e140c
Uses shorter AddCommand form for "show estates"
2012-03-08 02:23:52 +00:00
Justin Clark-Casey (justincc)
650d761c06
Display help commander topics in capitalized form - the commands themselves are still lowercase.
...
Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
2012-03-08 02:17:45 +00:00
Justin Clark-Casey (justincc)
430304c176
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 01:59:00 +00:00
Justin Clark-Casey (justincc)
749c3fef8a
Change "help" to display categories/module list then "help <category/module>" to display commands in a category.
...
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
2012-03-08 01:51:37 +00:00
UbitUmarov
3d3b81e676
changes on undo/redo (untested/incomplete). Think we may consider moving this mfrom SOP to client side. At least does seem to work a bit better ( again there wwas a issue on sop.copy )
2012-03-07 07:31:26 +00:00
Justin Clark-Casey (justincc)
6bdea15ecf
minor: make NPC tests run in a given order, comment out log lines in mock region data plugins, null out scene in script and npc torture tests, add other doc comments to torture tests
2012-03-07 01:11:37 +00:00
Melanie
f8b1b86c3a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-03-07 01:05:32 +00:00
Melanie
a1b28a61a6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-07 01:04:09 +00:00
Melanie
7769362687
Always zero the PhysActor on dupes to prevent side effects on the orignal prim
2012-03-07 01:03:26 +00:00
Melanie
5884d08062
Fix merge issue
2012-03-07 00:58:01 +00:00