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
3dbf754651
Merge branch 'master' into careminster
2012-03-09 23:00:24 +00:00
5c5a493791
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-09 22:59:23 +00:00
35f2479858
fix for NPC not playing internal animations
2012-03-09 22:58:59 +00:00
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
81869c4a3f
More on HG inventory transfers. Move the FireAndForget higher up.
2012-03-09 09:48:12 -08:00
0e5e324a2c
ubitOde bug
2012-03-09 17:20:49 +00:00
e83a2181d0
on linking update linked parts physical flags acording to new parent ones ( untested )
2012-03-09 17:19:10 +00:00
13f340077c
let chode and ubitode find ode.dll on windows
2012-03-09 04:19:39 +00:00
f545d669de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 19:32:21 -08:00
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
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
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
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
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
c22446ede0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 18:29:08 -08:00
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
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
e1be1c5263
Merge branch 'ubitwork'
2012-03-09 02:11:25 +01:00
e5786ba043
more changes on undo/redo group scaling seems to work better
2012-03-09 02:56:14 +00:00
99c64f0645
Fix a merge artefact
2012-03-09 02:45:53 +00:00
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
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
42a7a85062
FireAndForget scripted rez - port from Avination
2012-03-09 00:57:49 +00:00
ac577bf606
Merge branch 'master' into careminster
2012-03-09 00:56:52 +00:00
df4b06aed1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-09 00:20:10 +00:00
034c9d6bcc
Merge branch 'xassetservice'
2012-03-09 00:19:42 +00:00
3c5bd7c35a
minor: move some compression related var setup inside compression if/then switch
2012-03-09 00:16:49 +00:00
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
9c8ef96301
Fixes mantis #5923
2012-03-08 15:55:43 -08:00
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
b0fc96c17d
Merge branch 'master' into careminster
2012-03-08 19:10:22 +00:00
3089344114
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-08 19:09:11 +00:00
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
fa2a64564a
Move "change region" command into general category
2012-03-08 02:24:37 +00:00
dfdb0e140c
Uses shorter AddCommand form for "show estates"
2012-03-08 02:23:52 +00:00
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
430304c176
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 01:59:00 +00:00
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
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
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
f8b1b86c3a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-03-07 01:05:32 +00:00
a1b28a61a6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-07 01:04:09 +00:00
7769362687
Always zero the PhysActor on dupes to prevent side effects on the orignal prim
2012-03-07 01:03:26 +00:00
5884d08062
Fix merge issue
2012-03-07 00:58:01 +00:00
caa19862fa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-07 00:51:59 +00:00
f3e04beb2e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-07 00:51:24 +00:00
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
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
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
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
e9d8eb5a27
Remove unnecessary explicit ElapsedEventHandler in SimReporter
2012-03-06 22:31:25 +00:00
0be4ed3df4
Prevent scripted region crossings from crashing with prim limits enabled
2012-03-06 22:27:01 +01:00
17b1454d6f
Null PhysActor on SOP.Copy() to prevent clobbering the original one
2012-03-06 20:20:12 +01:00
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
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
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
f33654b62f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-06 03:07:48 +00:00
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
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
85198a45cb
Fix off by one error in script error reporting.
2012-03-06 02:01:47 +00:00
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
5004d0ad09
Merge branch 'master' into careminster
2012-03-06 01:45:20 +00:00
d44b7c486a
Go back to setting appearance directly in NPCModule.SetAppearance() to fix mantis 5914
...
The part reverted is from commit 2ebb421http://opensimulator.org/mantis/view.php?id=5914
2012-03-06 01:27:30 +00:00
af46650bae
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-03-06 01:18:37 +00:00
aa613dab1f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-06 00:29:43 +00:00
5e77973667
Merge branch 'master' into careminster
2012-03-06 00:29:25 +00:00
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
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
fd2b285b1b
remove unnecessary hash local variable
2012-03-05 23:50:41 +00:00
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
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
7377e633c7
update ubitOde
2012-03-05 12:37:21 +00:00
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
a647a37683
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-05 04:03:37 +00:00
c2a73a26b5
SL compatibility - return only points on segemtn, not ray in llCastRay
2012-03-05 02:37:51 +01:00
0ed4f24b34
A stab at making llEjectFromLand work in all cases
2012-03-05 02:14:27 +01:00
182f5efbe9
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-04 16:23:46 +00:00
6338996f87
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2012-03-04 16:23:19 +00:00
33a154e446
Merge branch 'master' of /home/opensim/var/repo/opensim into v3_support
2012-03-04 10:42:37 -05:00
01fcd400d7
update UbitOde
2012-03-04 04:26:05 +00:00
99bb3ccb3d
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-04 04:11:38 +00:00
7c931037bd
update UbitODE
2012-03-04 01:40:12 +00:00
6dc4a6dfb1
Zero velocity when drag-copying
2012-03-04 00:06:07 +01:00
fc781f0894
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-03 17:08:01 +00:00
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
3780df8a32
Make asset compression optional. Currently set to false and not configurable from outside MySQLXAssetData.
2012-03-03 01:43:36 +00:00
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
2535a4cafc
If asset data already exists with the required hash then don't rewrite it
2012-03-03 00:05:02 +00:00
94b323d1d8
Perform asset storage transactionally
2012-03-02 23:41:54 +00:00
7113b44bdd
Merge branch 'master' into xassetservice
2012-03-02 23:30:19 +00:00
98ad6ed255
comment out "[CAPS]: ScriptTaskInventory Request" log spam
2012-03-02 23:29:35 +00:00
e81b3502ef
Make xassetservice execute one query to retrieve the asset, not two
2012-03-02 23:26:03 +00:00
c2c102d33e
Remove outdated comment about checking attachment prims in Scene.PipeEventsForScript()
2012-03-02 22:52:26 +00:00
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
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
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
d242d47e5c
OpenID auth needs hashing before authenticating
2012-03-02 15:05:06 -05:00
6fc350725d
Merge branch 'master' into v3_support
2012-03-02 15:02:09 -05:00
64a036b4cf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-02 09:19:35 -08:00
8d249f8456
ScenePresence line endings and fix AllowMovement default to true.
2012-03-02 09:19:13 -08:00
f42fd7fb77
update ubitODE
2012-03-02 15:05:30 +00:00
6e3523e25e
minor: remove mono compiler warning
2012-03-02 04:08:07 +00:00
2a2656f629
Merge branch 'master' into xassetservice
2012-03-02 04:01:53 +00:00
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
8fccd2b555
Send the right name and creation date on the BasicProfileModule.
2012-03-01 19:55:51 -08:00
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
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
ec48a2f32b
minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"
2012-03-02 01:54:48 +00:00
94971bf3b9
Provide feedback on bot login states in pCampbot
2012-03-02 01:31:28 +00:00
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
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
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
7a88d21e59
Merge branch 'master' of /home/opensim/src/opensim
2012-03-01 14:20:46 -05:00
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
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
aabbbb32ff
Flick master up to 0.7.4
2012-02-29 23:45:14 +00:00
69c999033b
Revert "Fix authentication for OpenID provider"
...
This reverts commit 9f597c2d42
2012-02-29 15:52:15 -05:00
df75f5ae37
Merge branch 'master' of /home/opensim/src/opensim
2012-02-29 14:42:36 -05:00
afc9a7d3f9
Merge branch 'master' of /home/opensim/src/opensim into v3_support
2012-02-29 14:39:51 -05:00
9f597c2d42
Fix authentication for OpenID provider
2012-02-29 14:39:07 -05:00
ee4d3bfad2
ubitODE bug fix
2012-02-29 19:36:16 +00:00
a8f1cd7e86
update ubitODE to current working state
2012-02-29 19:32:23 +00:00
a0d75be56b
fix
2012-02-29 05:14:29 +00:00
42ddb0e88f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-29 05:08:13 +00:00
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
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
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
670c7842a4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-29 00:03:55 +00:00
2fce7dd593
Call Dispose() via using() on SqliteCommands in WebStatsModule after use.
2012-02-28 22:54:21 +00:00
a813e7ffdd
Fixed two typos. White space cleanups.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-28 14:12:39 -07:00
a8a7bb549d
made box a little larger
2012-02-28 20:24:03 +00:00
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
f11ab97747
Fix and hook up llTeleportAgent
2012-02-28 20:51:19 +01:00
0fb50a8a9e
Implement llTeleportAgent
2012-02-28 20:48:31 +01:00
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
4268427ac3
Some clean up in WebUtil, remove unused ServiceRequest function.
2012-02-27 15:15:03 -08:00
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
960c575dd2
Merge branch 'ubitwork'
2012-02-27 10:35:38 +01:00
aee4ca2f1c
Fix vehicles going physical stopping llTargetOmega parts (boat radar)
2012-02-27 08:50:19 +01:00
d342008e5b
Fix NPC appearance setting to include attachments again
2012-02-27 08:49:19 +01:00
0d51c42f59
update ubitODE to my current working state
2012-02-27 02:10:03 +00:00
d46235f5a3
Merge branch 'ubitwork'
2012-02-26 21:17:31 +01:00
e5e5b94cbe
Make llSetKeyframedMotion prims waut at the borders of down sims and try again
...
periodically.
2012-02-26 21:16:24 +01:00
118986f150
added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh data.
2012-02-26 17:51:43 +00:00
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
ac1e30156a
Implement proper selection behavior
2012-02-26 15:09:00 +01:00
416f39a561
Implement KeyframedMotion selection behavior
2012-02-26 15:06:05 +01:00
8cdc115c91
Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
...
code.
2012-02-26 14:30:24 +01:00
9a15bba99b
Fix an infinite recursion caused by checking the wrong values for
...
Buoyancy, Force and Torque
2012-02-26 13:31:29 +01:00
aa552d0526
Serialize Keyframe motion for region crossings
2012-02-26 12:29:35 +01:00
142f8a4aec
HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.
2012-02-25 21:00:19 -08:00
edc78defed
Zero force and torque on take so that items don't run away when rezzed
2012-02-26 02:52:08 +01:00
e9120890a2
Merge branch 'ubitwork'
2012-02-26 02:41:41 +01:00
c82709c0d6
Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.
2012-02-26 02:36:34 +01:00
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
4177571a78
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support
2012-02-25 14:33:56 -05:00
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
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
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
b48b0b1e58
Remove EXPERIMENTAL tags from load iar/save iar commands.
2012-02-25 00:48:41 +00:00
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
70b4bc8cf5
Merge branch 'ubitwork'
2012-02-24 19:48:39 +01:00
23679c3808
replace bad meshs by a small cube and log it.
2012-02-24 20:34:11 +00:00
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
ec94b82f51
stop using useless geom tricallback.
2012-02-24 18:25:43 +00:00
95f43ab73e
Add a cache on GridService requests
2012-02-24 18:17:30 +01:00
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
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
9e6ffe7798
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
2012-02-24 05:15:47 +00:00
84735b644c
Get rid of some of the identical exception catching in Scene.Update().
2012-02-24 05:12:56 +00:00
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
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
0b9f4d7e74
llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTarget
2012-02-24 00:58:11 +00:00
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
daf58575f8
Partially apply the core banlines fix
2012-02-23 23:05:04 +00:00
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
e74bf46007
Prevent a nullref when nonphysical motion objects cross sim boundaries
2012-02-23 23:18:01 +01:00
7c520cf531
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-23 22:27:20 +01:00
1c0adfa6e0
Correct sit position calculations
2012-02-23 22:26:17 +01:00
f3ea2bde61
Fix preserving the animation state of a crossing seated avatar
2012-02-23 20:32:35 +01:00
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
f266c54f82
Merge branch 'ubitwork'
2012-02-23 13:10:02 +01:00
56cc573d2f
Show avatars as sitting on proot prims only to avoid motion jitter
...
for passengers
2012-02-23 12:20:20 +01:00
af377470e1
Merge branch 'master' into v3_support
2012-02-22 22:29:30 -05:00
e827bcaf2b
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-23 02:04:16 +00:00
f1a76195ea
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-23 01:49:14 +00:00
9ed4245d9e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-23 01:42:08 +00:00
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
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
aa77d1d486
fix my bug on ChODE terrain heightmap build
2012-02-23 00:22:44 +00:00
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
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
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
1e1270166f
Adjust sit target and the llSetLinkPrimitiveParams sit position hack
...
to match SL.
2012-02-22 20:40:44 +01:00
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
65f5f60317
Merge branch 'master' into careminster
2012-02-21 23:43:39 +00:00
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
1273ec6c7d
Merge branch 'master' into careminster
2012-02-21 23:17:39 +00:00
1c533eb520
Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim
2012-02-21 23:15:33 +00:00
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
24a49011cb
Merge branch 'master' into careminster
2012-02-21 22:54:00 +00:00
76f411147d
Revert "Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569 "
...
This reverts commit 15ce73cacahttp://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
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
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
dede31174e
Merge branch 'master' into careminster
2012-02-21 22:08:34 +00:00
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
0e4d5a4d3c
Also preserve angular velocity on crossing.
2012-02-21 10:10:04 +01:00
03e7bc1526
Merge branch 'master' into careminster
...
Conflicts:
2012-02-21 10:20:56 +00:00
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
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
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
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
ee62bf3c69
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-20 20:23:14 +01:00
3b2900e884
Merge branch 'master' into careminster
2012-02-20 19:48:28 +00:00
4a329098e8
Amend to last commit: synchronize access to queues.
2012-02-20 11:12:02 -08:00
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
d6b8febbf4
Make vehicles retain velocity when crossing between regions.
2012-02-20 19:49:01 +01:00
8f8206f478
Add an override to make SOG.Velocity work as expected
2012-02-20 16:55:12 +01:00
1c3ee5d1ce
One more tweak related to the previous 2 commits.
2012-02-19 16:42:01 -08:00
b489c85226
Amend to last commit. This should have been committed too.
2012-02-19 15:37:37 -08:00
dcea23906b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-19 12:28:47 -08:00
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
77575ec51b
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 20:36:26 +01:00
756baff86a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-19 21:14:18 +00:00
4bc3a0ecf4
Uncomment serialization
2012-02-19 20:25:20 +01:00
433d5f1d3e
Merge branch 'ubitwork'
2012-02-19 20:24:00 +01:00
3c9b7f2c0c
simplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs
2012-02-19 19:27:01 +00:00
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
60d68ee312
Vehicle XML serialization more complete. Inactived by coments in SceneObjectSerializar.cs until proper testing
2012-02-19 18:10:00 +00:00
bcb9577495
Use localy defined name, TPFlags, for Constants.TeleportFlags
2012-02-19 12:09:57 -05:00
488ec59408
Merge branch 'master' into careminster
2012-02-19 14:57:51 +00:00
b77d354e6d
moved vehicle from SOG to SOP
2012-02-19 13:21:01 +00:00
185bf55804
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 14:20:53 +01:00
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
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
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
736fb0b41d
minor fix to chODE terrain heighmap scale
2012-02-19 02:07:43 +00:00
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
7a1ab03b75
missing paramenters init plus some cleaning
2012-02-18 19:31:36 +00:00
a62baf8ea4
added a EnUsCulture whatever that is..
2012-02-18 18:37:29 +00:00
028dc1f4ed
a bit less human readable xml
2012-02-18 18:33:41 +00:00
70b3b599bc
added some ToXml2 to SOGVehicle ( unused untested )
2012-02-18 18:25:48 +00:00
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
91a326331f
vehicle parameters do cross (i hope) on regions in same instance ( others need xml)
2012-02-18 16:16:48 +00:00
5351ff925c
let SOG know about vehicles. Still needs serialization and applyphyscis on deserialize, etc
2012-02-18 14:08:42 +00:00
14e9bf894c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-18 00:51:23 -05:00
f4cd35322f
Route logins according to Estate, Telehub and TeleportFlags
2012-02-18 00:45:43 -05:00
7bdcf9eb26
Propagate our teleport flags on logins
2012-02-18 00:32:09 -05:00
9846a1e56e
Report an error if the required native Windows ODE library can't be found.
2012-02-18 02:52:29 +00:00
fbccff4994
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-17 21:15:18 -05:00
84184708de
Fix a bug where changing shape parameters of a child prim in a linkset would not persist.
...
Resolves http://opensimulator.org/mantis/view.php?id=5819
2012-02-18 01:15:43 +00:00
8f8b478d36
Parcel sales support to SQLite
2012-02-17 20:04:38 -05:00
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
...
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
2012-02-18 00:33:52 +00:00
d03e878d53
Fillin missing SQLite support for Telehubs
2012-02-17 17:31:20 -05:00
b313d16493
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-17 13:51:54 -08:00
784263f5e3
Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set).
2012-02-17 13:45:45 -08:00
7d77ccc659
Added simple binary serializer/deserializer to chODE. 100% untested and most like still broken
2012-02-17 21:09:00 +00:00
6baa13ab7a
Add new and updated script events
2012-02-17 09:12:41 -08:00
0e16e0fb6a
Merge branch 'master' of /home/opensim/src/opensim
2012-02-17 08:21:33 -05:00
ba98d6fffe
Fix missing telehub handling on login
2012-02-17 08:03:53 -05:00
972f73ed2b
Make osNpcStopAnimation() call AvatarStopAnimation() rather than AvatarPlayAnimation()
2012-02-17 02:53:12 +00:00
c5ff37bf3e
Merge branch 'master' of /home/opensim/src/opensim
2012-02-16 09:01:02 -05:00
6b867773a8
Remove some debugging output form the logger
2012-02-16 08:59:34 -05:00
912aac3447
minor formatting changes from last commit (4486n7d)
2012-02-16 03:37:40 +00:00
4486b7d8e8
Fix: Object owned by the group does not return to the last owner http://opensimulator.org/mantis/view.php?id=5404
2012-02-16 03:35:18 +00:00
1267094a51
Turn off logging on test in last commit ( 2b84295).
2012-02-16 03:02:11 +00:00
2b842958cc
If shape properties fail SOP parsing (e.g. due to commas instead of decimal points) print out one short message listing the failing node names rather than lots of exceptions.
...
Adds skeleton bad float values deserialization test
2012-02-16 02:58:00 +00:00
80ec2ac167
Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends grid call would try and contact the wrong uri. Also fixes the build from df960d5
2012-02-16 01:39:12 +00:00
df960d5767
Add known identity informatio nto log message if an exception is thrown during LLUDPServer.HandleUseCircuitCode()
2012-02-16 01:25:54 +00:00
0c1074537b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-02-16 00:38:04 +00:00
c0760f9f91
Comment out "experimental" log message printed out whenever a physics mesh was generated for a mesh
...
Also adds prim name to the "no asset data" error log message
2012-02-16 00:28:57 +00:00
c906128191
Fix some logic mistakes where firstly osNpcCreate() without options was creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect.
...
Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872
2012-02-16 00:22:39 +00:00
819fcdaee1
Now if chode prim.cs detects out of bounds it requests a update and blocks movement and colisions. Base code must do a PhysActor.CrossingFailure() to make it move again inside sim or delete it.
2012-02-15 22:04:26 +01:00
3bffdddc9d
don't freeze with a sitted avatar in a border without other sim. Still messy :(
2012-02-15 22:04:17 +01:00
f6c35cf26f
Now if chode prim.cs detects out of bounds it requests a update and blocks movement and colisions. Base code must do a PhysActor.CrossingFailure() to make it move again inside sim or delete it.
2012-02-15 20:33:31 +00:00
b59275355e
don't freeze with a sitted avatar in a border without other sim. Still messy :(
2012-02-15 19:44:54 +00:00
a758abaa9f
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 17:08:33 +00:00
f6f0d884bd
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 16:44:15 +01:00
04279e36d1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-15 03:51:30 +00:00
f574d3c8fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-15 01:50:57 +00:00
ebe5e1731d
In ObjectTortureTests, run garbage collector on Teardown and run scene loop update when scene objects have been deleted.
...
At least on mono 2.6.4, running GC.Collect() is not guaranteed to force gc of all objects when run in the same method where those objects had references.
Therefore, GC.Collect() is now being done in the per-script teardown of ObjectTortureTests.
In addition, scene loop update is being run after garbage collection in order to clean out the viewer update list of scene objects in the SceneGraph.
These measures mean that scene objects/parts are now garbage collected after a test run if deleted from the scene, resulting in a much better memory usage report (though probably still not very accurate).
However, deletion takes a very long time - what's really needed is to find out now why the entire scene isn't being GC'd by this measure.
This change hasn't yet been applied to the other stress tests.
2012-02-15 01:45:25 +00:00
2ebb421331
Refactor appearance saving for NPC to use AvatarFactoryModule interface.
2012-02-14 17:20:34 -08:00
7be9ba5564
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-02-15 01:11:35 +00:00
272ba5a741
Merge branch 'master' into careminster
2012-02-15 01:11:17 +00:00
2d3381b795
Implement region crossing of sitting avatars. Edit mode and llSetPos work
...
but unscripted default sit anim is lost. Still some Gfx glitching. Physical
crossing doesn't work yet.
2012-02-14 23:16:20 +01:00
a9e8bd59a3
Fix a race condition in the simian groups connector. When requests were
...
too slow they would circumvent the cache (piling up on the network service
and making the problem even worse). This condition happens frequently
during permission checks.
2012-02-13 19:38:22 -08:00
4589ce61bc
Fix: get embedded objects from Notecard fails with activated FreeSwitchVoiceModul
...
http://opensimulator.org/mantis/view.php?id=2607
2012-02-14 02:12:12 +00:00
33e66107be
Fix: Lightshare Module(Windlight)-Region settings are not applicable for database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
2012-02-14 02:06:42 +00:00
db90dea9bd
Fix: MSSQLDB Grid - unable to register region http://opensimulator.org/mantis/view.php?id=5886
2012-02-14 02:04:02 +00:00
04544b4510
Revert "Add GridStore migration for MSSQL."
...
This reverts commit 0b17a66e68
2012-02-14 02:03:23 +00:00
0b17a66e68
Add GridStore migration for MSSQL.
...
This is done blind since I don't use MSSQL. If this doesn't work, then one will have to wait for it to be updated for the 0.7.3 opensim release.
2012-02-14 02:02:11 +00:00
04986bbb15
Add some more data to the new user connection logging for debug purposes.
2012-02-14 01:50:51 +00:00
e321306517
Prevent object loss and positioning outside the region with failed object sim
...
crossings
2012-02-14 00:02:53 +01:00
04a195266b
short circuit the expensive parts of the permission checking code
...
if the current user is the owner of an object. none of the later
checks can reverse the outcome.
2012-02-13 13:21:42 -08:00
21393af631
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-13 20:48:50 +00:00
189c67db95
On object deserialization, go back to logging errors at DEBUG level rather than ERROR. Restore extra log message if shape processing fails.
...
Logging level was DEBUG before 312e145312e145
2012-02-13 20:43:26 +00:00
6fd6919a0b
remove drawstuff from ubitode
2012-02-11 19:25:41 +00:00
f168fefb79
removed outdated coments.
2012-02-11 19:14:27 +00:00
bcf59a574f
remove forgotten taints code
2012-02-11 19:12:04 +00:00
09f6647aa3
scenepresence change! in standup() give avatar a physical actor after deciding the new position. This reduces a bit the odds of it being still coliding with object.
2012-02-11 17:48:49 +00:00
022ae33ed5
UbitODE: replace 'taints' by 'changes' for avatars also. This provides better time order with changes in prims.
2012-02-11 17:35:38 +00:00
d4e28ed113
vehicle changes done by simulation thread and not calling one
2012-02-11 15:18:13 +00:00
3f9c390b4d
changes to vehicle banking
2012-02-11 14:29:36 +00:00
33a9f0f1c5
a bit better vertical attractor and banking
2012-02-11 04:42:45 +00:00
f415256e0b
Use mesh to estimate real center of prims if avaiable. Let sculpt map textures with alpha channel work. On linux J2DecodeCache folder must be deleted to remove bad entries. Corrently this can't be cached on linux (mono/ cairo/? problem)
2012-02-11 03:25:17 +00:00
b617411b97
scale avatar push force with avatar density
2012-02-11 02:48:38 +00:00
b92b9228ef
correct the default avatar_terminal_velocity value that I accidentally left in whilst testing
2012-02-11 02:29:07 +00:00
f49897a419
Clamp ODE character velocity. Make ODE falling character 54m/s by default.
...
If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value.
In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver.
This also appears to be the value used on the linden lab grid.
This should resolve http://opensimulator.org/mantis/view.php?id=5882
2012-02-11 02:28:40 +00:00
aab30f5e67
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-11 00:11:28 +00:00
e7fd732209
Make ScenePresence.MovementFlag a private only settable value to reduce complexity of code analysis
2012-02-11 00:10:59 +00:00
acfe7e555e
Merge branch 'master' into careminster
2012-02-10 23:59:10 +00:00
5023cc86f0
Change parser to leave embedded quotes alone if the pattern is recognized
...
as an OptionSet long option
2012-02-10 23:58:39 +00:00
4455140f30
Change parser to leave embedded quotes alone if the pattern is recognized
...
as an OptionSet long option
2012-02-10 23:52:06 +00:00
43a74d8481
test on git
2012-02-10 23:51:55 +00:00
71e484516a
minor: Remove warning from RegionInfo due to repeated config.GetString() call where the first was unused.
2012-02-10 23:41:14 +00:00
38f878952c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-10 23:39:59 +00:00
d80422eba7
Add line numbers to Util.PrintCallStack()
2012-02-10 23:39:32 +00:00
e3f5fd81f1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
prebuild.xml
2012-02-10 23:03:30 +00:00
7cf73cb92a
Changes to vehicles code etc. Includes some debug aids to remove later.
2012-02-10 22:43:51 +00:00
ee078f717a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-10 16:28:11 -05:00
73f34de1f9
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-02-10 16:27:14 -05:00
b3d152f3ba
Fix an npc delete race condition with LSL sensors where an initial presence check could succeed but then the npc removed before the subequent npc check.
...
The resulting null would cause an exception. We now check for null before looking at SenseAsAgent.
Hopefully fixes http://opensimulator.org/mantis/view.php?id=5872
2012-02-10 21:26:05 +00:00
a7dc7e636e
Fix: Covenant view fails after updates or cache-clean see mantis http://opensimulator.org/mantis/view.php?id=2879
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-10 15:45:03 -05:00
44d84bc277
Fix bug where somebody taking a copy of an object they didn't own that was rezzed before the region was restarted would wrongly place the copy in the object owner's inventory.
...
Addresses http://opensimulator.org/mantis/view.php?id=5825
2012-02-10 19:58:34 +00:00
215acbcc96
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-02-10 10:20:51 +00:00
7273e05995
Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.org/mantis/view.php?id=3731
2012-02-10 02:30:55 +00:00
ddca5347c3
When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer permissions, not PermissionMask.All
...
Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set.
This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is).
Should resolve http://opensimulator.org/mantis/view.php?id=5651
2012-02-10 02:13:15 +00:00
9c84a8162f
If NPCModule.CreateNPC() fails to create the required ScenePresence (which should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
2012-02-09 01:17:59 +00:00
16c4636048
Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.
2012-02-09 00:38:09 +00:00
7c888f6af1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-02-09 00:19:37 +00:00
dbe32a1f6d
minor: put in commented out logging statements for future reuse
2012-02-09 00:10:45 +00:00
6af01f6767
initial introdution of physics actor building control.
2012-02-08 23:14:53 +00:00
dfa19e23f0
Stop a scene object from attempting to link with itself (which results in an exception and constant complaints in v3 viewers).
...
Aims to address http://opensimulator.org/mantis/view.php?id=5878
2012-02-08 22:19:34 +00:00
6cc9aa30ac
first change in SOP. in AddPrimShape(..) give physics the world rotation and not local offset. Currently physics interface only knows about world frame
2012-02-08 15:45:44 +00:00
c75fa8b8a1
changes in physics manager, needed for UbitODE
2012-02-08 15:28:13 +00:00
815f3af1d7
UbitODE plugin initial commit
2012-02-08 15:24:10 +00:00
9c6ba8d18f
Push more NPC stuff into threads
2012-02-08 13:04:23 +01:00
bef2a368f4
Make WebStats logging report consistently as WEB STATS MODULE instead of VC, VS and WEBSTATS
2012-02-07 23:38:53 +00:00
236e1c45f2
Merge branch 'master' into careminster
2012-02-07 23:30:48 +00:00
c87751a822
Add start GC memory and end GC memory to object stress test printouts.
...
This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general).
This means even the current stress tests take much more memory than they need, a problem that will have to be addressed.
2012-02-07 23:03:53 +00:00
1f402fdf5e
Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an exception in service connectors
2012-02-07 21:40:28 +00:00
bd928218dd
Add TestAddTaskInventoryItem()
2012-02-07 21:00:47 +00:00
7583768b9e
Remove debug logging if physics actor is null in SOP.ApplyPhysics()
...
This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor).
2012-02-07 20:26:26 +00:00
de255321f1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-07 20:52:04 +01:00
37049180f6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-07 21:09:04 +00:00
c22970448f
Add TestCompileAndStart100Scripts() torture test.
2012-02-07 19:42:32 +00:00
038d1bf742
Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText().
...
The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory.
Later path concatenation is already done by Path.Combine() which handles any trailing slash.
Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
2012-02-07 17:44:37 +00:00
a829f20828
Experimental. Expand Fire & Forget for NPC delete
2012-02-06 22:26:25 +01:00
54fc78013d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-02-05 20:58:04 +00:00
Justin Clark-Casey (justincc)