Justin Clark-Casey (justincc)
95ec96bf86
refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event)
...
Also add other various illustrative comments
2012-03-14 00:29:36 +00:00
Melanie
8388182707
Implement llSetPrimitiveParams for physics shape and material. Add
...
llSetPhysicsMaterial support.
2012-03-13 22:20:12 +01:00
Melanie
d4e6834f99
Hook up the new cap to the SOP changes
2012-03-13 20:49:16 +01:00
Melanie
f53c322b7e
Merge branch 'ubitwork'
2012-03-13 20:21:26 +01:00
UbitUmarov
577d07aa44
missed commit of extraphysics parameters serialization..
2012-03-13 19:51:41 +00:00
UbitUmarov
741badc4fa
let PhysicsShapeType none remove physics remove physics on child parts **UnTested**
2012-03-13 19:24:41 +00:00
UbitUmarov
bf2a5508de
bug fix
2012-03-13 19:17:32 +00:00
Melanie
f415eb84e1
Implement the cap to send extra physics params to the viewer. Not functional
...
yet because the parameters are not actually stored anywhere yet.
2012-03-13 20:06:39 +01:00
UbitUmarov
923db53975
let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy with it disabled...
2012-03-13 18:10:43 +00:00
UbitUmarov
5086fe9176
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-13 18:00:27 +00:00
UbitUmarov
3de3b9e63c
initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
2012-03-13 17:56:32 +00:00
Diva Canto
37828c9b9a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 08:07:11 -07:00
Diva Canto
4eb2605c79
Datasnapshot: added "secret" to the registration/deregistration query so that data providers can verify authenticity if they want.
2012-03-13 08:06:30 -07:00
Melanie
22e0cc09ac
Ensure child prims of a phantom prim are marked as phantom
2012-03-13 13:12:14 +01:00
Melanie
ebcd4910a2
Refactor, move OjectChangeData into it's own file and rename
...
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
2012-03-13 13:08:32 +01:00
Justin Clark-Casey (justincc)
25592bbd85
Add max thread and min thread information to "xengine status" region console command
2012-03-12 21:16:05 +00:00
Robert Adams
e0dd38f672
Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().
...
.NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5
and before, WebUtil defined an extension method for Stream with the signature
Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter
is different in the two forms and depending on which compiler and/or
runtime you use, you could get one form or the other. Crashes ensue.
This change renames the WebUtil stream copy method to something that
cannot be confused with the new CopyTo method defined in .NET 4.0.
2012-03-12 10:07:04 -07:00
Diva Canto
13fb582c12
DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the capitalization of 'name' to lower case, also in the same <grid> section.
2012-03-12 07:55:17 -07:00
Melanie
edc8a15487
Restore duplication of the SL bug where linking phantom to solid lets the
...
child prim remain phantom
2012-03-12 14:06:39 +01:00
Melanie
bfd38ecad4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 11:45:38 +01:00
Melanie
139c0665cf
Add AVATAR_MALE flag to return values of llGetAgentInfo
2012-03-12 11:44:07 +01:00
UbitUmarov
a35e00e81e
allocate UndoRedoStore only on demand
2012-03-12 07:50:14 +00:00
UbitUmarov
b5e172677d
ubitode prim select was not doing phantom case
2012-03-12 07:46:20 +00:00
UbitUmarov
6c4c500ee4
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 06:58:38 +00:00
UbitUmarov
2a17dafa04
missing file in ubitODE
2012-03-12 06:52:03 +00:00
Melanie
44ce068d6c
Allow RLV to redirect received folders to #RLV folder
2012-03-11 18:21:47 +01:00
UbitUmarov
925295f3ab
ubitOde also knows a bit more about physical phantom
2012-03-11 12:33:59 +00:00
UbitUmarov
7832889437
Physical phantoms testable with chOde. Volume detection was changed and also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED ***
2012-03-11 11:01:38 +00:00
UbitUmarov
dab7e03584
bug fix (??) in sog copy()
2012-03-11 08:43:53 +00:00
UbitUmarov
43dc0ee020
more phantom physics ( chODE and a fix in manager physicsactor
2012-03-11 07:44:34 +00:00
UbitUmarov
21a76a619f
initial steps to support physical phantoms
2012-03-11 06:32:06 +00:00
UbitUmarov
b0f01cec98
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 03:57:59 +00:00
Diva Canto
824eb7ed20
Added osGetGridGatekeeperURI()
2012-03-10 19:51:28 -08:00
UbitUmarov
1f7c0c2ea0
cleanup + comments
2012-03-11 03:28:17 +00:00
UbitUmarov
53bda83cc2
cleanup + comments
2012-03-11 03:14:15 +00:00
UbitUmarov
80160c128d
coments change..
2012-03-11 02:58:56 +00:00
UbitUmarov
dba0d79833
minor changes on updates control on doChangeObject(..)
2012-03-11 02:55:39 +00:00
Melanie
4f7ec1d691
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-03-11 01:55:36 +01:00
Melanie
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
UbitUmarov
e4e6f781a6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 00:53:53 +00:00
Melanie
0a4056ad22
Merge branch 'ubitwork'
2012-03-11 01:47:36 +01:00
UbitUmarov
ab235abc46
Changed undo redo internals. moved exec code to UndoState.cs from sop that now only sees a unified UndoRedoStore class, added size limit on buffers so only last 5 undo/redo are kept. (5 is hardcode like it was ) ***UNTESTED***
2012-03-11 00:36:34 +00:00
UbitUmarov
908abb1c3d
BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
2012-03-10 20:32:19 +00:00
Diva Canto
291dc39691
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-10 08:09:43 -08:00
Justin Clark-Casey (justincc)
05e821c444
Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thread.
...
This was previous behaviour anyway.
2012-03-10 03:11:28 +00:00
Justin Clark-Casey (justincc)
6e26f17923
minor: In IAR save, log when we start adding the control file rather than saying afterwards that we added it.
2012-03-10 02:13:17 +00:00
Justin Clark-Casey (justincc)
5507752dc5
minor: rearrange some save oar messages so they say what they're about to do rather than what they've just done.
2012-03-10 02:11:30 +00:00
Justin Clark-Casey (justincc)
1693799623
On OAR saving, try fetch assets serially rather than firing all the requests at the asset service at once.
...
This may (or may not) improve reliability for http://opensimulator.org/mantis/view.php?id=5898
Quick tests show that save time is the same.
2012-03-10 02:03:07 +00:00
Justin Clark-Casey (justincc)
d6ebf2d6ca
Add ability to specify a default estate to be used when creating regions.
...
This is configured in the new [Estates] section of OpenSim.ini.
If a default estate is configured then all new regions are automatically joined to it instead of asking the user.
If the default estate does not already exist then it is created.
Current default behaviour remains the same - the user is asked for estate details when necessary.
Thanks to Frenando Oliveira for the patch which I adapated further.
2012-03-10 01:27:05 +00:00
Mic Bowman
7b8e9d88e3
Serialize all web requests to a particular host:port pair; only applied to the PostToService variants.
2012-03-09 16:53:51 -08:00
Justin Clark-Casey (justincc)
bdc968f1fc
Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy.
...
As per opensim-users mailing list discussion.
2012-03-09 23:57:24 +00:00
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
UbitUmarov
13f340077c
let chode and ubitode find ode.dll on windows
2012-03-09 04:19:39 +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
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
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
Melanie
e1be1c5263
Merge branch 'ubitwork'
2012-03-09 02:11:25 +01:00
UbitUmarov
e5786ba043
more changes on undo/redo group scaling seems to work better
2012-03-09 02:56:14 +00:00
Melanie
99c64f0645
Fix a merge artefact
2012-03-09 02:45:53 +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
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
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
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
Melanie
caa19862fa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-07 00:51:59 +00:00
Melanie
f3e04beb2e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-07 00:51:24 +00:00
Justin Clark-Casey (justincc)
f3678d217f
Stop individually deleting objects at the end of each ObjectTortureTest.
...
We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests.
This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in).
Slightly simplifies config read in Scene constructor to help facilitate this.
2012-03-07 00:31:18 +00:00
Justin Clark-Casey (justincc)
23aba007dd
Add documentation to make more explicit the difference between OnRezScript and OnNewScript in the event manager
...
OnNewScript fires when a script is added to a scene
OnRezScript fires when the script actually runs (i.e. after permission checks, state retrieval, etc.)
2012-03-07 00:04:24 +00:00
Justin Clark-Casey (justincc)
3376979923
Remove static m_MainInstance in LocalGridServiceConnector.
...
I believe this was originally required back when there could be two LocalGridServiceConnectors but this is no longer the case.
Having such statics makes performance testing much more difficult since they prevent GC of objects unless static references are explicitly nulled.
2012-03-06 23:51:50 +00:00
Justin Clark-Casey (justincc)
98251cdab3
Add sensor, dataserver requests, timer and listener counts to "xengine status" command.
...
This is for diagnostic purposes.
2012-03-06 23:21:17 +00:00
Justin Clark-Casey (justincc)
e9d8eb5a27
Remove unnecessary explicit ElapsedEventHandler in SimReporter
2012-03-06 22:31:25 +00:00
Melanie
0be4ed3df4
Prevent scripted region crossings from crashing with prim limits enabled
2012-03-06 22:27:01 +01:00
Melanie
17b1454d6f
Null PhysActor on SOP.Copy() to prevent clobbering the original one
2012-03-06 20:20:12 +01:00
Justin Clark-Casey (justincc)
0f4cdc0c5b
Explictly close down the StatsReporter so that we can shutdown its timer
...
This is another step necessary for the scene to be garbage collected between performance tests
2012-03-06 19:05:32 +00:00
Melanie
de03d1ece0
Removed some whitespace errors - don't be naughty, don't use hard tabs!
...
Also removed commented code block.
2012-03-06 09:56:19 +01:00
UbitUmarov
cca94aaefc
make copied parts have diferent LocalIds than original. More building control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED
2012-03-06 05:13:39 +00:00
UbitUmarov
f33654b62f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-06 03:07:48 +00:00
Justin Clark-Casey (justincc)
b3449e998a
Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()
...
They were all failing assertions but the exceptions these threw were caught as expected Exceptions.
I don't think we can easily distinguish these from the Exceptions that we're expecting.
So for now we'll do some messy manually checking with boolean setting instead.
This patch also corrects the assertions themselves.
2012-03-06 02:30:22 +00:00
Justin Clark-Casey (justincc)
a92153ed88
Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that they're running
2012-03-06 02:21:19 +00:00
Justin Clark-Casey (justincc)
85198a45cb
Fix off by one error in script error reporting.
2012-03-06 02:01:47 +00:00
Justin Clark-Casey (justincc)
1dc03e5c4f
Simplify NPCModuleTests code by putting the NPCModule in an instance variable rather than making each test fetch it seperately.
...
Also rename instance variables in the test to conform to naming standards and for understandability
2012-03-06 01:47:43 +00:00
Melanie
5004d0ad09
Merge branch 'master' into careminster
2012-03-06 01:45:20 +00:00
Justin Clark-Casey (justincc)
d44b7c486a
Go back to setting appearance directly in NPCModule.SetAppearance() to fix mantis 5914
...
The part reverted is from commit 2ebb421
.
Unfortunately, IAvatarFactoryModule.SetAppearance() does not transfer attachments.
I'm not sure how to do this separately, unfortunately I'll need to leave it to Dan :)
Regression test added for this case.
Mantis ref: http://opensimulator.org/mantis/view.php?id=5914
2012-03-06 01:27:30 +00:00
Melanie
af46650bae
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-03-06 01:18:37 +00:00
Melanie
aa613dab1f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-06 00:29:43 +00:00
Melanie
5e77973667
Merge branch 'master' into careminster
2012-03-06 00:29:25 +00:00
Chris Hart
413bc1e77e
Updates to MSSQL store for 0.7.3 to include:
...
* Telehub support
* Bugfix to Friends lookups
* Updates to Creator fields to store up to 255 characters for HG item creator storage
2012-03-06 00:27:49 +00:00
Justin Clark-Casey (justincc)
441449e240
Switch to sha256 from sha1 in order to avoid future asset hash collisions.
...
Some successful collision attacks have been carried out on sha1 with speculation that more are possible.
http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms
No successful attacks have been shown on sha256, which makes it less likely that anybody will be able to engineer an asset hash collision in the future.
Tradeoff is more storage required for hashes, and more cpu to hash, though this is neglible compared to db operations and network access.
2012-03-06 00:14:21 +00:00
Justin Clark-Casey (justincc)
fd2b285b1b
remove unnecessary hash local variable
2012-03-05 23:50:41 +00:00
Melanie
a7b61add99
Allow NPC to be removed by the owner of the parcel they're over.
...
Don't allow NPC creation unless the prim owner has rez rights.
2012-03-05 22:22:28 +01:00
Melanie
f2653b9b8e
Teleport users to the cornfield when they are teleported with
...
llTeleportAgentHome(). Don't try to teleport NPCs.
2012-03-05 21:52:24 +01:00
UbitUmarov
7377e633c7
update ubitOde
2012-03-05 12:37:21 +00:00
Melanie
97f0cff388
llListSort SL compatibility: When sorting strided list and the list
...
length is not a multiple of the stride, return the original list.
Also, enforce that sort is ascending only when the ascending
parameter is 1, and not when it is != 0
2012-03-05 11:54:06 +01:00
UbitUmarov
a647a37683
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-05 04:03:37 +00:00
Melanie
c2a73a26b5
SL compatibility - return only points on segemtn, not ray in llCastRay
2012-03-05 02:37:51 +01:00
Melanie
0ed4f24b34
A stab at making llEjectFromLand work in all cases
2012-03-05 02:14:27 +01:00
Melanie
182f5efbe9
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-04 16:23:46 +00:00
Melanie
6338996f87
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2012-03-04 16:23:19 +00:00
BlueWall
33a154e446
Merge branch 'master' of /home/opensim/var/repo/opensim into v3_support
2012-03-04 10:42:37 -05:00
UbitUmarov
01fcd400d7
update UbitOde
2012-03-04 04:26:05 +00:00
UbitUmarov
99bb3ccb3d
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-04 04:11:38 +00:00
UbitUmarov
7c931037bd
update UbitODE
2012-03-04 01:40:12 +00:00
Melanie
6dc4a6dfb1
Zero velocity when drag-copying
2012-03-04 00:06:07 +01:00
UbitUmarov
fc781f0894
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-03 17:08:01 +00:00
Melanie
1f32730798
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-03-03 09:58:57 +00:00
Justin Clark-Casey (justincc)
3780df8a32
Make asset compression optional. Currently set to false and not configurable from outside MySQLXAssetData.
2012-03-03 01:43:36 +00:00
Justin Clark-Casey (justincc)
75dc8b1aed
Implement basic gzip compression for xassetdata
...
Whether this is worthwhile is debatable since here we are not transmitting data over a network
In addition, jpeg2000 (the biggest data hog) is already a compressed image format.
May not remain.
2012-03-03 01:28:58 +00:00
Justin Clark-Casey (justincc)
2535a4cafc
If asset data already exists with the required hash then don't rewrite it
2012-03-03 00:05:02 +00:00
Justin Clark-Casey (justincc)
94b323d1d8
Perform asset storage transactionally
2012-03-02 23:41:54 +00:00
Justin Clark-Casey (justincc)
7113b44bdd
Merge branch 'master' into xassetservice
2012-03-02 23:30:19 +00:00
Justin Clark-Casey (justincc)
98ad6ed255
comment out "[CAPS]: ScriptTaskInventory Request" log spam
2012-03-02 23:29:35 +00:00
Justin Clark-Casey (justincc)
e81b3502ef
Make xassetservice execute one query to retrieve the asset, not two
2012-03-02 23:26:03 +00:00
Justin Clark-Casey (justincc)
c2c102d33e
Remove outdated comment about checking attachment prims in Scene.PipeEventsForScript()
2012-03-02 22:52:26 +00:00
Justin Clark-Casey (justincc)
089fd61a3b
Allow a script to receive events if its root prim is in an area where it's allowed to run rather than checking its own prim.
...
This allows scripts to run in child prims that are outside region boundaries.
This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug
Thanks tglion!
2012-03-02 22:43:24 +00:00
Melanie
bfcba0a417
This still causes terrain artefacts
...
Revert " fix my bug on ChODE terrain heightmap build"
This reverts commit aa77d1d486
.
2012-03-02 22:20:02 +01:00
Melanie
458f295fdb
This still causes terrain artefacts
...
Revert " fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1."
This reverts commit 15bc539bd4
.
2012-03-02 22:19:28 +01:00
BlueWall
d242d47e5c
OpenID auth needs hashing before authenticating
2012-03-02 15:05:06 -05:00
BlueWall
6fc350725d
Merge branch 'master' into v3_support
2012-03-02 15:02:09 -05:00
Dan Lake
64a036b4cf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-02 09:19:35 -08:00
Dan Lake
8d249f8456
ScenePresence line endings and fix AllowMovement default to true.
2012-03-02 09:19:13 -08:00
UbitUmarov
f42fd7fb77
update ubitODE
2012-03-02 15:05:30 +00:00
Justin Clark-Casey (justincc)
6e3523e25e
minor: remove mono compiler warning
2012-03-02 04:08:07 +00:00
Justin Clark-Casey (justincc)
2a2656f629
Merge branch 'master' into xassetservice
2012-03-02 04:01:53 +00:00
Justin Clark-Casey (justincc)
be4199c3bc
Make XAssetService a de-duplicating asset service.
...
This is an extremely crude implemenation which almost works by accident. Nevertheless it does work.
It can be tested with the instructions at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service#Testing
It does not interact at all with the existing asset service or any data stored there.
This code is subject to change without notice and should not be used for anything other than gawking.
2012-03-02 03:57:55 +00:00
Diva Canto
8fccd2b555
Send the right name and creation date on the BasicProfileModule.
2012-03-01 19:55:51 -08:00
Dan Lake
e8779cd9e5
In ScenePresence, removed several private variables used to store public parameters. They were only used by the get/set and make code harder to refactor.
2012-03-01 19:22:05 -08:00
Justin Clark-Casey (justincc)
dd63cd1656
Start by adding XAssetService as a copy of the existing AssetService.
...
This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets.
Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default.
Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429
More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service
Feedback and discussion welcome as commits are made.
2012-03-02 02:23:35 +00:00
Justin Clark-Casey (justincc)
ec48a2f32b
minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"
2012-03-02 01:54:48 +00:00
Justin Clark-Casey (justincc)
94971bf3b9
Provide feedback on bot login states in pCampbot
2012-03-02 01:31:28 +00:00
Justin Clark-Casey (justincc)
d8c4985527
Move SenseRepeaters.Count check inside the SenseRepeatListLock.
...
No methods in the List class are thread safe in the MS specification/documentation
2012-03-02 00:28:37 +00:00
Justin Clark-Casey (justincc)
dcfd05c8ea
lock SenseRepeatListLock when added a new sensor during script reconstitution.
...
This is already being done in the other place where a sensor is added.
Adding a sensor whilst another thread is iterating over the sensor list can cause a concurrency exception.
2012-03-02 00:22:23 +00:00
Mic Bowman
8a375f3c30
Adds an OSSL command for regular expression-based string replacement. Parameters
...
are osReplaceString(string source, string patter, string replace, integer count, integer start)
The count parameter specifies the total number of replacements to make, -1 makes
all replacements.
2012-03-01 14:49:49 -08:00
BlueWall
7a88d21e59
Merge branch 'master' of /home/opensim/src/opensim
2012-03-01 14:20:46 -05:00
BlueWall
a2b0ed537e
Fix indexing on string trim
...
Thanks to zadark for pointing this out,
smxy for deciphering the ?: operator and
Plugh for the fix \o/ yay for IRC
2012-03-01 14:18:48 -05:00
Justin Clark-Casey (justincc)
0007711eb5
Use a fully stubbed out MockConsole for unit tests rather than inheriting from CommandConsole.
...
This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands.
This prevents the scene from being garbage collected at the end of a test.
This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc.
2012-03-01 03:23:10 +00:00
Justin Clark-Casey (justincc)
aabbbb32ff
Flick master up to 0.7.4
2012-02-29 23:45:14 +00:00
BlueWall
69c999033b
Revert "Fix authentication for OpenID provider"
...
This reverts commit 9f597c2d42
. Fixing OpenID causes issues with other parts of the code.
2012-02-29 15:52:15 -05:00
BlueWall
df75f5ae37
Merge branch 'master' of /home/opensim/src/opensim
2012-02-29 14:42:36 -05:00
BlueWall
afc9a7d3f9
Merge branch 'master' of /home/opensim/src/opensim into v3_support
2012-02-29 14:39:51 -05:00
BlueWall
9f597c2d42
Fix authentication for OpenID provider
2012-02-29 14:39:07 -05:00
UbitUmarov
ee4d3bfad2
ubitODE bug fix
2012-02-29 19:36:16 +00:00
UbitUmarov
a8f1cd7e86
update ubitODE to current working state
2012-02-29 19:32:23 +00:00
UbitUmarov
a0d75be56b
fix
2012-02-29 05:14:29 +00:00
UbitUmarov
42ddb0e88f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-29 05:08:13 +00:00
UbitUmarov
5534cf8b57
chODE: bad meshs get a a basic box or sphere geom with setted prim size. They will not colide if non-physical and Will collide with land if physical. assume UNTESTED
2012-02-29 05:03:26 +00:00
Justin Clark-Casey (justincc)
a181fae722
Don't start pCampbot if the user doesn't supply bot firstname, lastname stub and password
2012-02-29 03:00:56 +00:00
Justin Clark-Casey (justincc)
40c838896c
Use correct casing of RegionSettings.Sandbox in the various database modules.
...
MySQL and MSSQL have it as Sandbox, sqlite as sandbox.
In various different places in every plugin the wrong casing is used...
Consistency, who needs it? Or one day sqlite can change to Sandbox.
2012-02-29 00:33:17 +00:00
Justin Clark-Casey (justincc)
670c7842a4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-29 00:03:55 +00:00
Justin Clark-Casey (justincc)
2fce7dd593
Call Dispose() via using() on SqliteCommands in WebStatsModule after use.
2012-02-28 22:54:21 +00:00
Kevin Cozens
a813e7ffdd
Fixed two typos. White space cleanups.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-28 14:12:39 -07:00
UbitUmarov
a8a7bb549d
made box a little larger
2012-02-28 20:24:03 +00:00
UbitUmarov
1c7700db88
A few blind changes to go try to go around bad mesh little box replacement fail
2012-02-28 20:14:26 +00:00
Melanie
f11ab97747
Fix and hook up llTeleportAgent
2012-02-28 20:51:19 +01:00
Melanie
0fb50a8a9e
Implement llTeleportAgent
2012-02-28 20:48:31 +01:00
Melanie
9bad3b846f
Really dirty hack to make sims start. Causes errors but the ting runs. Remove
...
when fixed right.
2012-02-28 10:37:46 +01:00
Mic Bowman
4268427ac3
Some clean up in WebUtil, remove unused ServiceRequest function.
2012-02-27 15:15:03 -08:00
UbitUmarov
a725b5e01e
Let inworld meshs colide as such and not as basic prim all the time. Removed also LOD, and outerskin on colision meshs.
2012-02-27 20:08:43 +00:00
Melanie
960c575dd2
Merge branch 'ubitwork'
2012-02-27 10:35:38 +01:00
Melanie
aee4ca2f1c
Fix vehicles going physical stopping llTargetOmega parts (boat radar)
2012-02-27 08:50:19 +01:00
Melanie
d342008e5b
Fix NPC appearance setting to include attachments again
2012-02-27 08:49:19 +01:00
UbitUmarov
0d51c42f59
update ubitODE to my current working state
2012-02-27 02:10:03 +00:00
Melanie
d46235f5a3
Merge branch 'ubitwork'
2012-02-26 21:17:31 +01:00
Melanie
e5e5b94cbe
Make llSetKeyframedMotion prims waut at the borders of down sims and try again
...
periodically.
2012-02-26 21:16:24 +01:00
UbitUmarov
118986f150
added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh data.
2012-02-26 17:51:43 +00:00
Melanie
fca8c82232
Move KeyframeMotion from SOG to SOP because we can't persist it any
...
other way because SOG doesn't technically exist in the DB
2012-02-26 18:11:38 +01:00
Melanie
ac1e30156a
Implement proper selection behavior
2012-02-26 15:09:00 +01:00
Melanie
416f39a561
Implement KeyframedMotion selection behavior
2012-02-26 15:06:05 +01:00
Melanie
8cdc115c91
Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
...
code.
2012-02-26 14:30:24 +01:00
Melanie
9a15bba99b
Fix an infinite recursion caused by checking the wrong values for
...
Buoyancy, Force and Torque
2012-02-26 13:31:29 +01:00
Melanie
aa552d0526
Serialize Keyframe motion for region crossings
2012-02-26 12:29:35 +01:00
Diva Canto
142f8a4aec
HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.
2012-02-25 21:00:19 -08:00
Melanie
edc78defed
Zero force and torque on take so that items don't run away when rezzed
2012-02-26 02:52:08 +01:00
Melanie
e9120890a2
Merge branch 'ubitwork'
2012-02-26 02:41:41 +01:00
Melanie
c82709c0d6
Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.
2012-02-26 02:36:34 +01:00
UbitUmarov
e07440d0c5
changed SOP Force and Torque, adding XML (de/)serialization, also changed Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
2012-02-25 22:20:25 +00:00
BlueWall
4177571a78
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support
2012-02-25 14:33:56 -05:00
Melanie
6386fdcda7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
2012-02-25 16:24:01 +00:00
PixelTomsen
01f454242d
PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented
...
http://opensimulator.org/mantis/view.php?id=5763
2012-02-25 15:33:33 +00:00
Melanie
5eb1679367
Delay the sending of the initial werables update until the inventory and
...
VFS in the viewer are ready. We're much faster than SL and that exposes this
race condition. Also reinstate the extra avatar data send on login
2012-02-25 12:25:16 +01:00
Justin Clark-Casey (justincc)
b48b0b1e58
Remove EXPERIMENTAL tags from load iar/save iar commands.
2012-02-25 00:48:41 +00:00
PixelTomsen
7b5e42c744
llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754
2012-02-24 23:10:41 +00:00
Melanie
70b4bc8cf5
Merge branch 'ubitwork'
2012-02-24 19:48:39 +01:00
UbitUmarov
23679c3808
replace bad meshs by a small cube and log it.
2012-02-24 20:34:11 +00:00
Melanie
991826ca76
Try not to send the avatar updates on login. This may mean loggin in with
...
invisible attachments again but could help the appearance issues.
2012-02-24 19:31:27 +01:00
UbitUmarov
ec94b82f51
stop using useless geom tricallback.
2012-02-24 18:25:43 +00:00
Melanie
95f43ab73e
Add a cache on GridService requests
2012-02-24 18:17:30 +01:00
Melanie
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
Justin Clark-Casey (justincc)
bafef292f4
Take watchdog alarm calling back outside the m_threads lock.
...
This is how it was originally. This stops a very long running alarm callback from causing a problem.
2012-02-24 05:25:18 +00:00
Justin Clark-Casey (justincc)
9e6ffe7798
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
2012-02-24 05:15:47 +00:00
Justin Clark-Casey (justincc)
84735b644c
Get rid of some of the identical exception catching in Scene.Update().
2012-02-24 05:12:56 +00:00
Justin Clark-Casey (justincc)
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-24 05:02:33 +00:00
Justin Clark-Casey (justincc)
fe229f10e6
In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set speed.
2012-02-24 04:08:59 +00:00
PixelTomsen
0b9f4d7e74
llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTarget
2012-02-24 00:58:11 +00:00
Justin Clark-Casey (justincc)
f034958bdc
Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule.
...
This should resolve http://opensimulator.org/mantis/view.php?id=5901
2012-02-23 23:11:47 +00:00
Melanie
daf58575f8
Partially apply the core banlines fix
2012-02-23 23:05:04 +00:00
Justin Clark-Casey (justincc)
90ea00a109
Try to resolve some problems with viewers crashing after hitting parcel banlines or freezing on the banline.
...
This involves
1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport()
2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1
This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else.
This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
2012-02-23 22:56:42 +00:00
Melanie
e74bf46007
Prevent a nullref when nonphysical motion objects cross sim boundaries
2012-02-23 23:18:01 +01:00
Melanie
7c520cf531
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-23 22:27:20 +01:00
Melanie
1c0adfa6e0
Correct sit position calculations
2012-02-23 22:26:17 +01:00
Melanie
f3ea2bde61
Fix preserving the animation state of a crossing seated avatar
2012-02-23 20:32:35 +01:00
Melanie
dc835717d6
Properly sequence updates of avatars and attachments so that we don't
...
update attachments on child avatars or intermingle agent and attachment
updates, which would render the root prim of huds invisible
2012-02-23 14:08:35 +01:00
Melanie
f266c54f82
Merge branch 'ubitwork'
2012-02-23 13:10:02 +01:00
Melanie
56cc573d2f
Show avatars as sitting on proot prims only to avoid motion jitter
...
for passengers
2012-02-23 12:20:20 +01:00
BlueWall
af377470e1
Merge branch 'master' into v3_support
2012-02-22 22:29:30 -05:00
UbitUmarov
e827bcaf2b
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-23 02:04:16 +00:00
Melanie
f1a76195ea
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-23 01:49:14 +00:00
Melanie
9ed4245d9e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-23 01:42:08 +00:00
Melanie
1dfc990264
Add a position parameter to region crossing of objects. This avoids the
...
potential bad update that places an object at the opposite side of the
origin sim for a moment before actually crossing it. Especially important in
grids like OSG where lag between sims is high.
2012-02-23 01:40:30 +00:00
UbitUmarov
15bc539bd4
fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1.
2012-02-23 00:50:07 +00:00
UbitUmarov
aa77d1d486
fix my bug on ChODE terrain heightmap build
2012-02-23 00:22:44 +00:00
Melanie
c0b8f3d0bc
Add permission checks to scripted object movements, which didn't respect bans
...
and parcel settings until now. Add llSetRegionPos() function according to
LL spec
2012-02-23 00:08:31 +01:00
Melanie
3796e08b59
Count agents for LSL instead of relying on SceneGraph to have the correct
...
value. Fixes a reported glitch.
2012-02-22 23:14:29 +01:00
BlueWall
165ae251ec
V3 Support
...
The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
2012-02-22 16:36:28 -05:00
Melanie
1e1270166f
Adjust sit target and the llSetLinkPrimitiveParams sit position hack
...
to match SL.
2012-02-22 20:40:44 +01:00
Justin Clark-Casey (justincc)
5d31267185
Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in constructor and never subsequent set to null.
2012-02-22 00:55:16 +00:00
Melanie
65f5f60317
Merge branch 'master' into careminster
2012-02-21 23:43:39 +00:00
Justin Clark-Casey (justincc)
cf9b3e7708
Restore the taskItem null check that I accidentally blatted in 5397a6d
...
This is a valid check because the caller could supply an invalid uuid.
2012-02-21 23:41:48 +00:00
Melanie
1273ec6c7d
Merge branch 'master' into careminster
2012-02-21 23:17:39 +00:00
PixelTomsen
1c533eb520
Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim
2012-02-21 23:15:33 +00:00
Justin Clark-Casey (justincc)
5397a6d4c6
Fix problem with dragging child part inventory item to user inventory.
...
This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller.
Resolves http://opensimulator.org/mantis/view.php?id=5569
2012-02-21 22:54:30 +00:00
Melanie
24a49011cb
Merge branch 'master' into careminster
2012-02-21 22:54:00 +00:00
Justin Clark-Casey (justincc)
76f411147d
Revert "Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569 "
...
This reverts commit 15ce73caca
.
As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569 , I was going to fix this in a more general way.
2012-02-21 22:49:06 +00:00
PixelTomsen
15ce73caca
Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569
2012-02-21 22:07:12 +00:00
Melanie
cb4509f3b8
Reverse the changed to ODE heightmap. It results in SERIOUS issues like an
...
irreversible y-flip and holes in the map.
2012-02-21 21:34:02 +01:00
Melanie
dede31174e
Merge branch 'master' into careminster
2012-02-21 22:08:34 +00:00
BlueWall
7cf970fb27
V3 Support:
...
This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on.
2012-02-21 14:21:03 -05:00
Melanie
0e4d5a4d3c
Also preserve angular velocity on crossing.
2012-02-21 10:10:04 +01:00
Melanie
03e7bc1526
Merge branch 'master' into careminster
...
Conflicts:
2012-02-21 10:20:56 +00:00
Justin Clark-Casey (justincc)
daee2eda93
Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
...
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
2012-02-21 04:10:39 +00:00
Justin Clark-Casey (justincc)
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
2012-02-21 02:52:20 +00:00
Justin Clark-Casey (justincc)
90dc5f47e7
Fix bug where NPCs would establish child agents on other neighbour regions that had come up after the NPC was created.
2012-02-21 01:57:19 +00:00
Justin Clark-Casey (justincc)
19d271d3fc
Remove PhysXPlugin and wrappers.
...
In over 4 years this never progressed beyond an unimplemented stub.
This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
2012-02-21 01:45:17 +00:00
Melanie
ee62bf3c69
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-20 20:23:14 +01:00
Melanie
3b2900e884
Merge branch 'master' into careminster
2012-02-20 19:48:28 +00:00
Diva Canto
4a329098e8
Amend to last commit: synchronize access to queues.
2012-02-20 11:12:02 -08:00
Diva Canto
99b9c1a9d5
More improvements on agent position updates: if the target sims fail, blacklist them for 2 min, so that we don't keep doing remote calls that fail.
2012-02-20 10:58:07 -08:00
Melanie
d6b8febbf4
Make vehicles retain velocity when crossing between regions.
2012-02-20 19:49:01 +01:00
Melanie
8f8206f478
Add an override to make SOG.Velocity work as expected
2012-02-20 16:55:12 +01:00
Diva Canto
1c3ee5d1ce
One more tweak related to the previous 2 commits.
2012-02-19 16:42:01 -08:00
Diva Canto
b489c85226
Amend to last commit. This should have been committed too.
2012-02-19 15:37:37 -08:00
Diva Canto
dcea23906b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-19 12:28:47 -08:00
Diva Canto
20c65ac438
A few more tweaks on position updates and create child agents. Mono hates concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
2012-02-19 12:28:07 -08:00
Melanie
77575ec51b
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 20:36:26 +01:00
Melanie
756baff86a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-19 21:14:18 +00:00
Melanie
4bc3a0ecf4
Uncomment serialization
2012-02-19 20:25:20 +01:00
Melanie
433d5f1d3e
Merge branch 'ubitwork'
2012-02-19 20:24:00 +01:00
UbitUmarov
3c9b7f2c0c
simplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs
2012-02-19 19:27:01 +00:00
Melanie
96409cc2ee
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
2012-02-19 20:08:01 +01:00
UbitUmarov
60d68ee312
Vehicle XML serialization more complete. Inactived by coments in SceneObjectSerializar.cs until proper testing
2012-02-19 18:10:00 +00:00
BlueWall
bcb9577495
Use localy defined name, TPFlags, for Constants.TeleportFlags
2012-02-19 12:09:57 -05:00
Melanie
488ec59408
Merge branch 'master' into careminster
2012-02-19 14:57:51 +00:00
UbitUmarov
b77d354e6d
moved vehicle from SOG to SOP
2012-02-19 13:21:01 +00:00
Melanie
185bf55804
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 14:20:53 +01:00
PixelTomsen
d22715126c
Fix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view.php?id=5887
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-19 01:58:28 -07:00
PixelTomsen
a114367b9b
Fix:OmegaX, OmegaY and OmegaZ not saved for child prims http://opensimulator.org/mantis/view.php?id=5893
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-19 01:00:01 -07:00
Diva Canto
2ffc055f7e
This should smooth movement in heteregeneous networks by a lot: cache the region by position instead of looking it up all the time -- this was being done during the main update loop!
2012-02-18 21:59:42 -08:00
UbitUmarov
736fb0b41d
minor fix to chODE terrain heighmap scale
2012-02-19 02:07:43 +00:00
Melanie
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
UbitUmarov
7a1ab03b75
missing paramenters init plus some cleaning
2012-02-18 19:31:36 +00:00
UbitUmarov
a62baf8ea4
added a EnUsCulture whatever that is..
2012-02-18 18:37:29 +00:00
UbitUmarov
028dc1f4ed
a bit less human readable xml
2012-02-18 18:33:41 +00:00
UbitUmarov
70b3b599bc
added some ToXml2 to SOGVehicle ( unused untested )
2012-02-18 18:25:48 +00:00
UbitUmarov
3aee642190
changed how vehicle data is stored and passed to physics. use unsafe in serializer, tried to control m_dupeInProgress
2012-02-18 17:42:14 +00:00
UbitUmarov
91a326331f
vehicle parameters do cross (i hope) on regions in same instance ( others need xml)
2012-02-18 16:16:48 +00:00
UbitUmarov
5351ff925c
let SOG know about vehicles. Still needs serialization and applyphyscis on deserialize, etc
2012-02-18 14:08:42 +00:00
BlueWall
14e9bf894c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-18 00:51:23 -05:00
BlueWall
f4cd35322f
Route logins according to Estate, Telehub and TeleportFlags
2012-02-18 00:45:43 -05:00
BlueWall
7bdcf9eb26
Propagate our teleport flags on logins
2012-02-18 00:32:09 -05:00
Justin Clark-Casey (justincc)
9846a1e56e
Report an error if the required native Windows ODE library can't be found.
2012-02-18 02:52:29 +00:00