Robert Adams
e5367d822b
Merge of ubitworkvarnew with opensim/master as of 20150905.
...
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
UbitUmarov
cfcfa8f3d7
add lost admin_reset_land method
2015-09-06 21:46:30 +01:00
UbitUmarov
16025fa34b
remove a forgotten cast to int
2015-09-06 20:28:59 +01:00
UbitUmarov
af440162f7
minor change, add a lock we had at avn
2015-09-06 20:22:44 +01:00
Diva Canto
3a72e755b9
Deleted access control spec from [LoginService] section of standalone config. It's in OpenSim.ini now under [AccessControl]. Backwards compatibility preserved.
2015-09-06 10:02:16 -07:00
Diva Canto
82ea4179da
Clean up viewer-based access control specifications.
2015-09-06 10:00:20 -07:00
Diva Canto
4f208b6282
Related to previous commits: fixed namespace.
2015-09-06 09:31:35 -07:00
UbitUmarov
d9fafd9603
fix the missing initialization of the folish ProcessUnackedSends option
2015-09-06 17:12:31 +01:00
UbitUmarov
3a0137cb45
fix odd drawdistance control initialization
2015-09-06 16:36:30 +01:00
UbitUmarov
93b9a92990
add missing stub for llSetVelocity
2015-09-06 04:55:58 +01:00
Diva Canto
f928d41a27
Amend to previous commit: delete the corresponding AssemblyInfo's
2015-09-05 17:40:27 -07:00
Diva Canto
3cf07564b6
Moved the two region loaders into the RegionLoaderPlugin dll, therefore eliminating 2 top-level dlls that didn't make much sense.
2015-09-05 17:37:07 -07:00
UbitUmarov
94d13c6d22
dont store/upload map asset for large regions, ( needs testing)
2015-09-06 01:21:20 +01:00
UbitUmarov
c1a4786be0
still a missing stat ID
2015-09-06 01:01:31 +01:00
UbitUmarov
0ddcc55166
let extra stats travel side by side with viewers ones... try to fix damm array indexes all over the place
2015-09-06 00:32:20 +01:00
Diva Canto
5bfc2743c6
Deleted unused file.
2015-09-05 15:20:32 -07:00
UbitUmarov
4b1ecc90fc
fix modifing m_threads on a foreach scanning it
2015-09-05 21:23:22 +01:00
Diva Canto
bba79424b6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-09-05 10:29:18 -07:00
Diva Canto
c2346a0823
Changed a couple of comments to be more generic
2015-09-05 10:28:44 -07:00
UbitUmarov
13b1c5dfce
let ode suport var size regions
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-09-05 10:17:30 -07:00
dahlia
4b0dc6253c
Best wishes everyone!
2015-09-05 01:58:59 -07:00
Diva Canto
2210c5807f
Fixes a problem with Bullet physics when it is configured to run on a separate thread.
2015-09-04 16:33:07 -07:00
Diva Canto
d7f22fb2cc
POSScene wasn't really a region module. Fixed now.
2015-09-04 15:48:59 -07:00
Diva Canto
a32187f53a
Moved UserStatistics feature to OptionalModules too.
2015-09-04 15:28:51 -07:00
Diva Canto
49d19e3650
Moved DataSnapshot feature to OptionalModules too.
2015-09-04 15:17:53 -07:00
Diva Canto
f9a7099abc
Moved RegionCombinerModule to OptionalModules. Removed it as its own top-level project/dll.
2015-09-04 15:12:36 -07:00
UbitUmarov
2130984bef
a few changes to stats. Array order coerent on users. give up on moses stats for now, since SimExtraStatsCollector cant reach SimStatsReport etc
2015-09-04 23:07:25 +01:00
Diva Canto
d00f73c3a4
Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework.
2015-09-04 14:39:23 -07:00
Diva Canto
9005365115
Deleted old unfinished code under Framework.Communications that wasn't being used anywhere.
...
Also folded GenericAsyncResult into RestClient, since it is used only there. This is preparation to remove Framework.Communications entirely.
2015-09-04 14:14:53 -07:00
Diva Canto
1559fc42b6
Deleted unused interface
2015-09-04 13:45:52 -07:00
UbitUmarov
1c93be198b
comment a large debug message
2015-09-04 19:41:27 +01:00
Diva Canto
cb79e580dc
Fixed wrong path to Meshing dll
2015-09-04 11:27:39 -07:00
Diva Canto
218eb908be
In SceneGraph, use the property PhysicsScene instead of the variable _PhysScene, so that it gets properly initialized before being dereferenced.
2015-09-04 10:54:04 -07:00
Diva Canto
9d7e310e21
Deleted commented code
2015-09-04 09:40:21 -07:00
UbitUmarov
9aaaf705f5
actually reduce max number of ode spaces
2015-09-04 16:37:45 +01:00
UbitUmarov
ce1c5de793
bug fix on ode spaces and allow more of them on large regions
2015-09-04 15:47:21 +01:00
UbitUmarov
a54e0339ef
remove a forgotten 1000.9 factor on physics fps
2015-09-04 14:33:46 +01:00
UbitUmarov
08f9c54554
use GetTimeStampMS to increase heartbeat and stats timing resolution. some rearrange on stat code ( MOSES special ones still out )
2015-09-04 12:05:31 +01:00
UbitUmarov
f0c865555b
add a GetTimeStampMS method, this returns a time stamp in miliSeconds with the resolution avaiable for StopWatchs. Value in double since it can be large (as machine uptime in high resolution ticks)
2015-09-04 11:05:15 +01:00
UbitUmarov
ac4b2b2f50
normalise physics plugins to return fps as (simulated time / requested simulation time). improved a bit old ode simulations per call math
2015-09-04 09:42:33 +01:00
Diva Canto
dac8edd5dd
Transformed the LLUDP ad-hoc plugin into a region module. It works.
2015-09-03 15:59:06 -07:00
UbitUmarov
1434cb88fd
a bit better addAvatar() call chain
2015-09-03 22:22:59 +01:00
UbitUmarov
2f9a018bc8
make addavatar more friendly between plugins
2015-09-03 22:09:27 +01:00
UbitUmarov
7bfa311e32
fix a old bug i added: MaxWearables can't be changed in runtime
2015-09-03 20:51:30 +01:00
UbitUmarov
5aa7a4fa52
fix CM_api compile error
2015-09-03 20:22:39 +01:00
UbitUmarov
db6c4a89a8
minor clean
2015-09-03 20:05:17 +01:00
UbitUmarov
b265e35d7c
missing file
2015-09-03 18:50:51 +01:00
UbitUmarov
cdaed11387
at last we can login and see objects ( friends is dead and disable in
...
scenepresence)
2015-09-03 18:39:08 +01:00
UbitUmarov
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
Diva Canto
0235e58fff
Moved ExtendedPhysics from OptionalModules to Bullet project, because it's very much an optional Bullet feature. This way, Bullet doesn't need to depend on the OptionalModules dll. No changes in configs or behavior.
2015-09-01 09:20:20 -07:00