1dc09d8e8f
We're not really done here.. but we're getting there. Socket Read is working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
2013-02-05 18:02:25 -05:00
d3892bbd06
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-05 21:30:12 +00:00
6bce4bc112
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-02-05 20:09:45 +00:00
2163bebeb4
Try to fix uploaded mesh rotations - code from Avination code base.
2013-02-05 20:09:02 +00:00
128910a681
Make scripts shout a error but not stop when button count is overrun on llDialog
2013-02-05 05:40:51 +01:00
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
1fc9f282fa
Merge branch 'dynamic-attributes2'
2013-02-05 00:35:15 +00:00
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
7482ad1c22
Merge branch 'master' into careminster
2013-02-04 19:21:39 +00:00
503c906732
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-04 07:09:36 +00:00
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
ee4f8ac193
Merge branch 'master' into JSONTCPClient
2013-02-03 08:18:53 -05:00
8fd99ecab1
Merge branch 'master' of ssh://opensim/var/git/opensim
2013-02-03 08:14:47 -05:00
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
29d521e273
Changing OpenSimDefaults back to default
2013-02-03 07:56:31 -05:00
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
27a0b3ecbd
Commit 1 in of this branch feature. This is one of many...
2013-02-03 06:49:17 -05:00
219a25c985
Merge /home/opensim/src/opensim
2013-02-01 23:14:19 -05:00
0ab68f6c31
Revert "Update assembly version numbers"
...
This reverts commit 141ad829f4
2013-02-01 23:13:33 -05:00
840f72f8a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-01 22:07:08 -05:00
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
57cf89f4a9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-01 21:58:32 -05:00
141ad829f4
Update assembly version numbers
2013-02-01 21:57:49 -05:00
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
2ff301ca11
Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom
2013-02-02 01:34:49 +00:00
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
d8d4e7f236
Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.
2013-02-01 15:42:24 -05:00
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
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
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
371449db2f
BulletSim: clean up TargetVelocity implementation by using the default defn in the PhysicsActor base class.
2013-01-31 15:55:53 -08:00
f984922dfd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-31 14:54:19 -08:00
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
627600dd68
Merge branch 'master' into careminster
2013-01-31 20:47:49 +00:00
6a4c8824ea
Whitespace fix and removing unneccessary parentheses
2013-01-31 20:46:41 +00:00
fb96e29fe3
Merge branch 'avination' into careminster
2013-01-31 20:45:11 +00:00
bfe0f5d081
* 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-31 20:38:14 +00:00
cc1781926b
* Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff.
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 20:37:58 +00:00
cfa8e9cfa7
Merge branch 'avination' into careminster
2013-01-31 20:36:20 +00:00
e497cf6f04
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-01-31 20:16:45 +00:00
1e354f70d2
Merge branch 'teravuswork' into avination
2013-01-31 20:26:47 +01:00
b659ccfc80
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-01-31 11:15:22 -08:00
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
a8fa8af9fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-30 23:44:06 -05:00
ce4faf497f
Add config option to Regions.ini for new maptile feature
2013-01-30 23:41:32 -05:00
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
9a4de546fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 02:53:11 +00:00
a0ef3df194
Add JsonTestStore to determine if a JsonStore is associated with
...
a particular UUID.
2013-01-30 14:45:03 -08:00
d1ebb0a8f9
Change keyframe motion to use a single timer for all objects. This is required
...
to prevent slippage between objects that are meant to move synchronously or
keep their relative positions/rotations.
2013-01-30 15:54:14 +01:00
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