b2592ab132
Fix a merge conflict
2015-11-16 15:30:39 +01:00
f93ce485b1
Merge branch 'master' into avinationmerge
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
2015-11-16 15:28:51 +01:00
53e0cd5534
handle diferente number of wearables on getting assets form another appearance
2015-11-15 10:04:35 +00:00
bcb27d4406
fix the protection for more Wearables than region suports
2015-11-15 08:16:52 +00:00
f5799ff445
That didn't actually do anything for Simian, and it broke the locahost
...
case
Revert "Also restoring proper function for Simian external GetTexture functionality."
This reverts commit 366e81b977
2015-11-14 08:10:27 -08:00
554d4bad8d
Fixed typos
2015-11-12 18:40:10 -08:00
3515fda101
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-11-12 18:31:27 -08:00
6f45c31ea0
Merge branch 'master' into avinationmerge
2015-11-13 03:24:23 +01:00
a2a71f0951
configuration options relative to last tow commits
2015-11-13 02:18:12 +00:00
75befda6df
Add some values to the SimulatorFeatures cap's OpenSimExtras section relative to FPS statistics. This is transition code ported from avinationmerge.
2015-11-13 02:12:13 +00:00
752a1534f8
add the option Normalized55FPS. This is transition code ported from avinationmerge branch. (configration file changes will be commited later)
2015-11-13 01:12:37 +00:00
f037f8335e
Merge branch 'master' into avinationmerge
2015-11-12 23:04:04 +00:00
55cce6aee0
minor: reset character collision flags, even if without a Body
2015-11-12 22:40:55 +00:00
9bd6befdeb
add some safeguard checks
2015-11-12 21:24:14 +00:00
8c7f475740
Add some values to the SimulatorFeatures cap's OpenSimExtras section:
...
SimulatorFPS: The actual optimal FPS of the simulator, un-fudged
SimulatorFPSFactor: The fudge factor that is applied to the stats sent to the viewer
SimulatorFPSWarnPercent: The percentage below which a lag meter should go to amber
SimulatorFPSCritPercent: The percentage below which a lag meter should go to red
To display the real values, a viewer would divide the reported FPS by the SimulatorFPSFactor and use that to calculate the percentage of SimulatorFPS. E.g. reported is 55fps, SimulatorFPSFactor is 5.0 and SimulatorFPS is 11.
2015-11-12 21:13:44 +01:00
d3911606ef
Move a call to RequestModuleInterface to a new scene callback function
...
because the current implementation would have always returned null
2015-11-12 20:34:09 +01:00
c4d225ed50
Corrections to ini example files for standalones v2
...
Remove "currently unused" indicators for some parameters and add missing
"DestinationGuide" parameter in [GridServiceInfo] in
StandaloneCommon.ini.example as they do work for a standalone.
Regularize example URLs for externally provided web page and economy
helper information for uniformity. Correct mistake in reference to grid
wide DestinationGuide in override capability in OpenSim.ini.example.
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
2015-11-12 12:44:53 -05:00
649a3fc39c
dont abort llDialog if buttons labels are longer than 24bytes, let udp truncate. This is not as spec but allows old scripts or with minor bugs to still work
2015-11-11 06:06:22 +00:00
adda0ab7d8
limit llDialog buttons text to 24 bytes (at lludp level)
2015-11-11 05:55:34 +00:00
b383cdae33
fix cut points of UTF-8 strings
2015-11-10 20:08:44 -08:00
2b937fdf40
reduce the small MTU violation sending terrain compressed patchs
2015-11-10 23:56:08 +00:00
188b2d84c1
increase the number of packets in Land queue that force terrain to delay patchs sending.
2015-11-10 23:50:00 +00:00
e096b49dd7
check if a packet can be sent imediatly without accounting it as sent on throttles when it is enqueued for later send.
2015-11-10 23:17:56 +00:00
40cb83b555
make m_minimumDripRate a bit larger than mtu. Add a bucket space check that does not consume avaiable space, so reducing bandwidth
2015-11-10 22:50:20 +00:00
f57a48a0fb
fix silly bug
2015-11-10 20:34:19 +00:00
5bfd49404d
start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug on slow terrain send limits check
2015-11-10 17:44:53 +00:00
b6c3592411
fix/add lldialog and llTextBox message size error checks, aborting if error as spec. (we can change this to silent truncate and execute the larger ones since llUdp now does it. But doing as spec now)
2015-11-10 15:08:08 +00:00
38aad774f7
change lldialog and llTextBox maximum message lenght to 512 bytes as specification.
2015-11-10 14:47:36 +00:00
ae9d40c7d0
add a StringToBytes variant that takes Maximum lenght as argument.
2015-11-10 14:29:13 +00:00
55b524aa74
fix: set Normalized55FPS default to TRUE
2015-11-09 15:37:57 +00:00
d17633f6c0
replace StatisticsFPSfactor that needed to be changed with FrameTime to a simpler true or false Normalized55FPS that is now TRUE by default. Incorrectly this commit also contains changes that should had their own commits: changes to heartbeat time control ant to gathering and calculation of related statistics.
2015-11-09 15:06:41 +00:00
3dc16b74af
add StatisticsFPSfactor configuration option (fudge factor) with default of 1.0 (inactive), corresponding to current decision. rename MinFrameTime as FrameTime, change its value and ODE step time. Changed several related coments. (someone may need to translate them to proper english)
2015-11-08 04:38:58 +00:00
097c56330a
rename MinFrameTime as FrameTime, since it is not a minimum but a target value; retune its value a bit so reported FPS is closer to integer value; change ode step size acording to reduce jitter in phys FPS; Make Statistics Scaling factor (fludge factor) configurable. (legacy default of 5.0 in code)
2015-11-08 04:28:46 +00:00
185d3bd39e
change maximum angular velocity to a value derived from heartbeat rate and Nyquist.
2015-11-08 01:47:54 +00:00
eccc6f1081
fix wrong condition to set low angular velocity as Zero.
2015-11-08 00:24:54 +00:00
69fefd1d00
send the estimation of time dilation at packet build time, not the one at unknown past.
2015-11-06 21:27:42 +00:00
527ea37540
change OfflineMessageModule from new avination code to original master, for compatibility with current web servers php scripts. This may change after current test phase
2015-11-06 05:18:54 +00:00
f8efd00775
add a console/log warning about large physics meshs on ubOde that can have negative impact on region load
2015-11-05 16:57:48 +00:00
dc752e8d82
fix get/set parameters on avatars
2015-11-05 03:07:25 +00:00
89655b0baa
apply OtakuMegane code changes to irc channel chat so some characters are not lost
2015-11-02 02:23:35 +00:00
baf5649b70
fix avatarAppearance wearables copy
2015-11-02 02:08:13 +00:00
51e5204a67
Add forgotten file
2015-11-02 01:21:28 +01:00
d02f566b49
Merge branch 'master' into avinationmerge
2015-11-02 00:45:48 +01:00
6bb12ab975
Set wearables count to max legacy wearables for version < 0.4
2015-11-02 00:45:05 +01:00
f88e4a1ec9
Plumb the rest of the context stuff. Well, what I see so far anyway
2015-11-02 00:23:38 +01:00
3da0a318b3
Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into avinationmerge
2015-11-01 23:40:54 +01:00
aea86f30a0
Don't crash the sim if the map image is null.
2015-11-01 11:38:41 -08:00
af7c002d52
Don't crash the sim if the map image is null.
2015-11-01 11:37:59 -08:00
5f18f2ce6a
More EntityTransferContext plumbing
2015-11-01 19:37:14 +01:00
69585a4824
More plumbing of the EntityTransferContext (not yet complete)
2015-11-01 19:11:14 +01:00
Melanie Thielker