9ad670e82c
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 20:43:59 +02:00
ce497ce379
debug...
2012-10-09 19:43:06 +01:00
785671e242
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-09 17:29:44 +01:00
40bf789ad7
Disambiguate use of RegionFlags in NullRegionData
...
This was not necessary with the nant build but is for xbuild, since xbuild includes associated project DLLs
And so picks up OpenMetaverse.dll even though it isn't referenced by OpenSim.Data.Null.dll
2012-10-09 17:20:01 +01:00
7e90ea3551
av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - No Avatar Avatar Collisions. This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment.
2012-10-09 10:41:16 -04:00
764270a0d8
Add config option to plant avatar where they are reducing avatar avatar 'pushability' av_planted see OpenSimDefaults.ini. Use when you have unruly visitors that rudely push each other around. Still allows a small amount of movement based on the avatar movement PID controller settings. You can increase the spring tension in the PID controller and really prevent any movement if you would like.
2012-10-09 09:26:11 -04:00
a960efeaba
Fix registry issue
...
Rebuild registry if loading from a local dll to give access to the addin data for it on the first pass.
2012-10-09 08:00:02 -04:00
92849c5cc3
missed some conflict markup
2012-10-09 07:59:44 -04:00
252af020b0
Merge branch 'master' into connector_plugin
...
Conflicts:
OpenSim/Server/ServerMain.cs
2012-10-09 06:44:14 -04:00
700ad535a2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 06:21:56 +02:00
315f3ee0e5
avoid crashing so debug is seen
2012-10-09 05:21:09 +01:00
005553e9d9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 06:10:05 +02:00
d0773dcd6a
another debug msg
2012-10-09 05:09:43 +01:00
d35a0b63e2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 05:32:58 +02:00
8717541288
force allocation of mesh data on creation ( messy code version )
2012-10-09 04:31:50 +01:00
e62cdc50f4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 03:58:25 +02:00
5ef48c5980
temporary debug code
2012-10-09 02:57:51 +01:00
ef3cc2e507
minor: Add documentation to IGridService.GetRegionFlags()
2012-10-09 01:40:55 +01:00
a0d047413b
Once again, forgot to add a file.
2012-10-09 01:37:02 +01:00
73c9abf5f2
Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
2012-10-09 01:35:27 +01:00
4b386760fe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 02:06:05 +02:00
4c512ada58
fire a extra terseupdate when stopping (like in loosing physics). In some
...
cases things seem not to stop
2012-10-09 01:04:29 +01:00
7be1b30914
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 01:45:11 +02:00
2e223c8ce2
Change ray to land colision range limitation so it has no impact on other
...
geom types
2012-10-09 00:44:02 +01:00
61cc62eac9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 01:29:09 +02:00
3bf7201fd4
move terrain geom to own ode space. Limit range on raycast if includes
...
terrain until ode doesn't eat all stack. Add a pre-simulation method to do
pending actors changes (except mesh assets still not ready to use), to be
optionaly called before firing heartbeat. [UNTESTED]
2012-10-09 00:18:39 +01:00
d342adaa87
Merge branch 'master' of git://opensimulator.org/git/opensim
2012-10-08 15:25:26 -07:00
f65218f826
Fix build break
2012-10-08 19:02:21 +01:00
839aa57b42
Update the example
2012-10-08 18:01:56 +01:00
ff92330523
Add a ServiceList section to Robust .ini to get rid of the long string
2012-10-08 17:57:22 +01:00
90a39379f0
Allow other whitespace characters than spaces in Robust connection string
2012-10-08 17:36:40 +01:00
8894f4ad77
Change permissions on child prim inventory items when god mode "force
...
permissive" is used.
2012-10-08 01:34:32 +02:00
2d2c4e3a86
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-08 00:55:44 +02:00
a1fcfe8677
a few changes/fix (?)
2012-10-07 23:54:15 +01:00
398d92dc40
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 09:54:48 +02:00
48d8fbc9ae
bug fix + make costs visible for testing
2012-10-07 08:53:55 +01:00
1af4d8b7f8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 07:34:17 +02:00
a0b4e68060
refix so we can compile it, loosing alpha scultps fix on core meshmerizer
2012-10-07 06:33:13 +01:00
c42df1259f
fix wrong file commited
2012-10-07 06:16:47 +01:00
03ef125ba0
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-10-07 06:13:24 +01:00
4a87a8f3b9
comment out a spam coment on core Meshmerizer
2012-10-07 06:11:51 +01:00
4efc90ef37
i update core ode plugin and make it load is meshs (i hope)
2012-10-07 05:53:52 +01:00
0c5b36a4f7
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 03:12:21 +01:00
9be2d5c77d
Fix merge issues
2012-10-07 03:03:24 +01:00
f7df68d922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 02:48:28 +01:00
7e1eecdf73
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 02:22:28 +02:00
78ce7a0a04
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
...
now
2012-10-07 01:20:52 +01:00
440726250c
Added parts to manage repositories and plugin management
...
This is working - more testing to follow, then soem documentation
2012-10-06 11:48:21 -04:00
13c4fd7271
refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is what it actually represents
2012-10-06 04:06:27 +01:00
9de991301c
Make UserSessionID a class rather than a struct, so that later updates to value suceed (rather than having to pull the data out and reinsert back into the Dictionary).
...
Fixes http://opensimulator.org/mantis/view.php?id=6338
2012-10-06 04:04:50 +01:00
ubit