Melanie
6bce4bc112
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-02-05 20:09:45 +00:00
Melanie
2163bebeb4
Try to fix uploaded mesh rotations - code from Avination code base.
2013-02-05 20:09:02 +00:00
Justin Clark-Casey (justincc)
562067eb16
Fix bug where viewers would not see the "Module command functions not enabled" error if these were disabled and a viewer attempted to call one.
...
This was not working because the shouter was wrongly signalled as an agent rather than a prim
2013-02-05 02:09:21 +00:00
Justin Clark-Casey (justincc)
1fc9f282fa
Merge branch 'dynamic-attributes2'
2013-02-05 00:35:15 +00:00
Justin Clark-Casey (justincc)
1f1da23097
Bump version and assembly version numbers from 0.7.5 to 0.7.6
...
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
2013-02-05 00:23:17 +00:00
Justin Clark-Casey (justincc)
503c906732
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-04 07:09:36 +00:00
Justin Clark-Casey (justincc)
80d9b336ff
Remove [XMLRPC] section I added by accident to the top of OpenSimDefaults.ini in previous commit 95883282
2013-02-04 07:08:48 +00:00
teravus
ee4f8ac193
Merge branch 'master' into JSONTCPClient
2013-02-03 08:18:53 -05:00
teravus
8fd99ecab1
Merge branch 'master' of ssh://opensim/var/git/opensim
2013-02-03 08:14:47 -05:00
teravus
6b0310b829
Adds the ability to load more then one IClientNetworkServer thereby allowing additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene.
2013-02-03 08:13:52 -05:00
teravus
29d521e273
Changing OpenSimDefaults back to default
2013-02-03 07:56:31 -05:00
teravus
d18fbb98b7
Adds the ability to load more then one IClientNetworkServer thereby allowing additional client stacks. Use comma separated values in clientstack_plugin in your config.
2013-02-03 07:44:45 -05:00
teravus
27a0b3ecbd
Commit 1 in of this branch feature. This is one of many...
2013-02-03 06:49:17 -05:00
BlueWall
219a25c985
Merge /home/opensim/src/opensim
2013-02-01 23:14:19 -05:00
BlueWall
0ab68f6c31
Revert "Update assembly version numbers"
...
This reverts commit 141ad829f4
.
2013-02-01 23:13:33 -05:00
BlueWall
840f72f8a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-01 22:07:08 -05:00
Justin Clark-Casey (justincc)
0d0bfa4dcd
minor: change comment about assuming script references are textures in UuidGatherer since this is no longer the behaviour.
2013-02-02 03:02:04 +00:00
BlueWall
57cf89f4a9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-01 21:58:32 -05:00
BlueWall
141ad829f4
Update assembly version numbers
2013-02-01 21:57:49 -05:00
Justin Clark-Casey (justincc)
9822bb664b
Log missing assets on "fcache assets" found. This ignores references found by scanning LSL/notecard files since these are the source of false positives.
...
This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures.
This is added to help people in determining when they have missing assets such as textures, etc.
In this case, one wants to run "fcache clear" first.
2013-02-02 02:57:38 +00:00
Justin Clark-Casey (justincc)
2ff301ca11
Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom
2013-02-02 01:34:49 +00:00
Justin Clark-Casey (justincc)
9588328242
Stop exceptions being thrown if GenerateMapTiles = false but no static map tile has been set. Do more informative warn instead.
2013-02-02 00:59:26 +00:00
teravus
d8d4e7f236
Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.
2013-02-01 15:42:24 -05:00
Robert Adams
5bb85a14d4
BulletSim: fix problem where editting a physical linkset caused the
...
child prim physical positions to get out of sync with the view.
More reliably compute the offset of children in a physical linkset.
2013-02-01 11:52:27 -08:00
Robert Adams
75a05c16c5
BulletSim: fix crash caused when linksets were rebuilt. A problem added
...
when individual child pos/rot changes were implementated a week or so ago.
Remove some passing of inTaintTime flag when it was never false.
2013-01-31 15:56:10 -08:00
Robert Adams
ed71c939fc
BulletSim: make sure vehicle physical properties are set when going
...
physical by delaying setting until pre-step time. Change vehicle.Refresh()
to schedule the pre-step setting.
Comments and updating of TODO list.
2013-01-31 15:56:02 -08:00
Robert Adams
371449db2f
BulletSim: clean up TargetVelocity implementation by using the default defn in the PhysicsActor base class.
2013-01-31 15:55:53 -08:00
Mic Bowman
f984922dfd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-31 14:54:19 -08:00
Mic Bowman
1e0420431f
Move the JsonStore regular expressions to static variables to avoid
...
recompiling on every operation. Added JsonList2Path script function
to simplify array iteration.
2013-01-31 14:53:16 -08:00
Melanie
6a4c8824ea
Whitespace fix and removing unneccessary parentheses
2013-01-31 20:46:41 +00:00
Dan Lake
b659ccfc80
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-01-31 11:15:22 -08:00
Dan Lake
17440d8a29
Added option for UUID as command parameters. This lets the command handle the UUID parsing and type checking before the command is executed.
2013-01-31 11:14:43 -08:00
BlueWall
a8fa8af9fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-30 23:44:06 -05:00
BlueWall
ce4faf497f
Add config option to Regions.ini for new maptile feature
2013-01-30 23:41:32 -05:00
Jak Daniels
fac72d540b
Allow use of MaptileStaticUUID in Regions.ini to override the global setting in OpenSim.ini for each region.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2013-01-30 23:37:02 -05:00
Mic Bowman
a0ef3df194
Add JsonTestStore to determine if a JsonStore is associated with
...
a particular UUID.
2013-01-30 14:45:03 -08:00
teravus
52ea6eadae
* This adds a bit more to the previous flying roll effect by adding additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.
2013-01-30 07:34:48 -05:00
teravus
7c4e0ff03c
* Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff.
2013-01-30 06:22:05 -05:00
Justin Clark-Casey (justincc)
d42c7afe3f
Add JsonDestroyStore() basic regression test
2013-01-30 05:56:30 +00:00
Justin Clark-Casey (justincc)
5a22efe69c
refactor: Make invocations of json store functions from the regression test simpler
2013-01-30 05:49:28 +00:00
Justin Clark-Casey (justincc)
addf9ada49
Add regression test for script func JsonRemoveValue()
2013-01-30 05:39:34 +00:00
Justin Clark-Casey (justincc)
5ac84a3793
Fix issue where lsl -> c# generation in co-operative termination mode did not correctly handle single statement versions of for, while and do-while loops.
...
Add regression tests to validate the fix.
This problem will not affect the default abort termination mode.
2013-01-30 03:52:22 +00:00
Robert Adams
a61ecee227
BulletSim: fix physics repositioning when under ground to only happen
...
for physical objects. Non-physical objects can go anywhere they want.
2013-01-29 17:04:28 -08:00
Justin Clark-Casey (justincc)
39700445f2
minor: change name of json script tests to JsonStoreScriptModuleTests instead of copy/pasted LSL_ApiInventoryTests
2013-01-29 04:36:41 +00:00
Justin Clark-Casey (justincc)
ccdf86c737
minor: remove EnableLogging() left over in CoopTerminationTests
2013-01-29 04:35:05 +00:00
Justin Clark-Casey (justincc)
e0f4e91d22
Try ignoring json tests if they can't be run due to being on <=.net 3.5
2013-01-29 04:26:47 +00:00
Justin Clark-Casey (justincc)
fd34a75cde
minor: Tidy up disabled logging on AssetTransactionModule for future use. Make it clear that transaction parameter to HandleUDPUploadRequest is an ID.
2013-01-29 04:03:33 +00:00
Justin Clark-Casey (justincc)
77cd74ded6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-29 03:59:38 +00:00
Justin Clark-Casey (justincc)
ca26ff9436
minor: remove some mono compile warnings in XEngine.cs
2013-01-29 03:58:11 +00:00
Robert Adams
47f09ed4c1
BulletSim: enable angular vertical attraction.
...
Increase terrain collision margin to help vehicles from tunneling
into same.
2013-01-28 17:21:13 -08:00