UbitUmarov
ce497ce379
debug...
2012-10-09 19:43:06 +01:00
Justin Clark-Casey (justincc)
785671e242
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-09 17:29:44 +01:00
Justin Clark-Casey (justincc)
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
teravus
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
teravus
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
ubit
700ad535a2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 06:21:56 +02:00
UbitUmarov
315f3ee0e5
avoid crashing so debug is seen
2012-10-09 05:21:09 +01:00
ubit
005553e9d9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 06:10:05 +02:00
UbitUmarov
d0773dcd6a
another debug msg
2012-10-09 05:09:43 +01:00
ubit
d35a0b63e2
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 05:32:58 +02:00
UbitUmarov
8717541288
force allocation of mesh data on creation ( messy code version )
2012-10-09 04:31:50 +01:00
ubit
e62cdc50f4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 03:58:25 +02:00
UbitUmarov
5ef48c5980
temporary debug code
2012-10-09 02:57:51 +01:00
Justin Clark-Casey (justincc)
ef3cc2e507
minor: Add documentation to IGridService.GetRegionFlags()
2012-10-09 01:40:55 +01:00
Justin Clark-Casey (justincc)
a0d047413b
Once again, forgot to add a file.
2012-10-09 01:37:02 +01:00
Justin Clark-Casey (justincc)
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
ubit
4b386760fe
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 02:06:05 +02:00
UbitUmarov
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
ubit
7be1b30914
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 01:45:11 +02:00
UbitUmarov
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
ubit
61cc62eac9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-09 01:29:09 +02:00
UbitUmarov
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
Dan Lake
d342adaa87
Merge branch 'master' of git://opensimulator.org/git/opensim
2012-10-08 15:25:26 -07:00
Melanie
f65218f826
Fix build break
2012-10-08 19:02:21 +01:00
Melanie
839aa57b42
Update the example
2012-10-08 18:01:56 +01:00
Melanie
ff92330523
Add a ServiceList section to Robust .ini to get rid of the long string
2012-10-08 17:57:22 +01:00
Melanie
90a39379f0
Allow other whitespace characters than spaces in Robust connection string
2012-10-08 17:36:40 +01:00
Melanie
8894f4ad77
Change permissions on child prim inventory items when god mode "force
...
permissive" is used.
2012-10-08 01:34:32 +02:00
ubit
2d2c4e3a86
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-08 00:55:44 +02:00
UbitUmarov
a1fcfe8677
a few changes/fix (?)
2012-10-07 23:54:15 +01:00
ubit
398d92dc40
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 09:54:48 +02:00
UbitUmarov
48d8fbc9ae
bug fix + make costs visible for testing
2012-10-07 08:53:55 +01:00
ubit
1af4d8b7f8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 07:34:17 +02:00
UbitUmarov
a0b4e68060
refix so we can compile it, loosing alpha scultps fix on core meshmerizer
2012-10-07 06:33:13 +01:00
UbitUmarov
c42df1259f
fix wrong file commited
2012-10-07 06:16:47 +01:00
UbitUmarov
03ef125ba0
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-10-07 06:13:24 +01:00
UbitUmarov
4a87a8f3b9
comment out a spam coment on core Meshmerizer
2012-10-07 06:11:51 +01:00
UbitUmarov
4efc90ef37
i update core ode plugin and make it load is meshs (i hope)
2012-10-07 05:53:52 +01:00
Melanie
0c5b36a4f7
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 03:12:21 +01:00
Melanie
9be2d5c77d
Fix merge issues
2012-10-07 03:03:24 +01:00
Melanie
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
ubit
7e1eecdf73
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 02:22:28 +02:00
UbitUmarov
78ce7a0a04
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
...
now
2012-10-07 01:20:52 +01:00
Justin Clark-Casey (justincc)
13c4fd7271
refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is what it actually represents
2012-10-06 04:06:27 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
16c9c1dff7
On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates.
...
The viewer would not see the folder move without this, either on accept or decline.
This commit also updates the TaskInventoryOffered message to better conform with the data LL uses
Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail,
message is just folder name in single quotes, message is not timestamped.
However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side.
Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
2012-10-06 02:34:49 +01:00
Dan Lake
91ca3117cb
Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full update. There should be a better way to indicate which properties have changed that is non LLUDP-centric
2012-10-05 17:32:07 -07:00
Dan Lake
6f220a8679
Trigger ObjectAddedToScene when loading objects from oarfile. Already triggers when creating, duplicating or loading from database, incoming attachments, etc
2012-10-05 17:30:27 -07:00
ubit
ceb33b24f7
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-05 07:04:58 +02:00
UbitUmarov
5254c0de8f
Merge branch 'avination' into ubitwork
2012-10-05 06:00:45 +01:00