617f42bcfa
try to mk jenkins happy
2017-06-12 01:32:18 +01:00
dd7ab862ab
stop doing UpdateMovementAnimations on avatar collisions, that may cause incorrect changes
2017-06-12 01:07:38 +01:00
953872510f
add/replace sources of OpenSim32.exe
2017-06-11 22:36:08 +01:00
d0afd4335c
fix a error message
2017-06-11 22:32:56 +01:00
5e83c2e422
forget about stupid mono 32bit
2017-06-11 19:29:59 +01:00
8c5f09f44b
actually.. its opensim, use same log file name in 32b mode
2017-06-11 18:56:34 +01:00
bd2da771a4
remove a ref to old 32bitlauncher
2017-06-11 18:38:54 +01:00
46c8c4854e
Set the execute bit on the bin/opensim*.sh files
2017-06-11 13:30:12 -04:00
7941f8da23
add opensim.sh and opensim32.sh for linux, replacing old opensim-ode.sh
2017-06-11 18:12:25 +01:00
08659811c7
put back opensim 32bit launcher, renamed as OpenSim32.exe. This allows opensim to run in 32bit mode on 64bit machines. Possible most opensim regions should be running like this. 2GB of Virtual memory is still a lot on memory
2017-06-11 13:04:34 +01:00
5842d5f7b0
revert. The .net concurrent objects look nice, but mono5 cpu load with them does not
2017-06-10 13:58:16 +01:00
73aa752034
replace some locked objects by .net4.0 concurrent objects
2017-06-10 04:18:31 +01:00
b5910cfdb7
merge
2017-06-10 02:48:51 +01:00
be975d1e89
add a adicional in transit flag to signal HG tps, and use it to ignore usernames requests sent to start region during tp; don't send unknows display names ( getdisplaynames cap )
2017-06-09 23:27:33 +01:00
e8165a7b51
only silent remove threads from watch list if they stopped ( ie still consider aborted etc )
2017-06-09 20:14:56 +01:00
f69e48bedc
make SendCoarseLocations async, since it is http. Make some actions use thread from pool and not a new one. Threading does need a deep cleanup one of this days. This stops mantis 8183 warnings, but as side effect only
2017-06-09 17:32:07 +01:00
3cddfddc3f
Minor changes to commented text in bin/OpenSim.ini.example
2017-06-09 10:14:09 -04:00
0ac6b74c5e
Fixed typo in log message
2017-06-09 10:14:09 -04:00
d12957dc2c
still losing time with of halcyon incompatibile oars... cathch exceptions of the function that actually throws; Reduce log spam; don't let a broken MOAP stop all object deserialization. Fixing MOAP does not mean halcyon oars issues are fixed, just one. And really we should not even try to go against halcyon decison to be incompatible.(our MOAP encoding did not change since 2010)
2017-06-09 12:14:13 +01:00
5bfe8b18fe
Another attempt at parsing MOAP <Media> elements in OAR files.
...
Seems there are multiple interpretations of the format of the content of the
<Media> element in OAR files. OpenSimulator (for reasons lost in the mist of time)
escapes the XML in the element and then reparses it was a separate XmlReader.
Other simulators fill the <Media> element with regular XML.
This patch parses the <Media> escaped XML content as it always has and, if
the parsing fails, falls back to trying to parse the pure XML.
2017-06-08 21:41:34 -07:00
1e3a19e673
bug fix plus some cleanup
2017-06-09 00:15:53 +01:00
ef2fd8fcea
keep the reverted code, that does work. Our code likes to have pbs.Media == null when there is no MOAD defined, so handle possible odd oars that may have llsd <array /> on that case
2017-06-08 20:47:51 +01:00
29f2421d4f
revert fa5bf4fd0b for test
2017-06-08 11:45:33 +01:00
7bea4f1578
Merge branch 'master' into httptests
2017-06-07 20:12:49 +01:00
02b51b84f4
so no real need for Maintenance thread.. so removed
2017-06-07 19:09:16 +01:00
2d93008bd9
course locations is a also heartbeat job (for now sync)
2017-06-07 18:52:56 +01:00
eca89c6e61
remove some more dead scene options
2017-06-07 18:15:15 +01:00
c8b3925085
remove nonsense SendPeriodicAppearanceUpdates. if we need such a thing, then a lot is broken. Remove duplicated CleanTempObjects() call, rename BackupWaitCallback thread as BackupWorker ( still didn't found cause for mantis 8783)
2017-06-07 18:04:02 +01:00
7d58b73bbc
some changes on pollevent
2017-06-06 21:55:47 +01:00
8971e9f126
Merge branch 'master' into httptests
2017-06-06 21:47:55 +01:00
9011ca8461
set optional group position and rotation before attach to scene
2017-06-06 20:38:17 +01:00
773914591d
Merge branch 'master' into httptests
2017-06-06 03:28:30 +01:00
a23f99366f
bug fix: handle current region on GetChildAgentsToClose
2017-06-06 03:22:11 +01:00
258d169392
Merge branch 'master' into httptests
2017-06-06 00:30:01 +01:00
fa5bf4fd0b
Correct parsing of 'Media' XML element in PrimitiveBaseShape when reading an OAR file.
...
The code used to call Serializer.ReadElementContentAsString() and then expected to
pass the XML to PrimitiveBaseShape.FromXml to parse. This would throw as
ReadElementContentAsString does not allow any children of the element.
Reading with Serializer.ReadInnerXml() was the fix.
This was only not a problem because most often shapes don't have media and
most simulators don't output anything if the media array is empty.
2017-06-04 20:51:56 -07:00
aea282ba38
Merge branch 'master' into httptests
2017-06-03 07:20:31 +01:00
4320758d97
remove redundant UpdateMovementAnimations();
2017-06-03 07:19:20 +01:00
01bd578bb0
Merge branch 'master' into httptests
2017-06-03 07:08:43 +01:00
f26ad07ce1
add a delayed stop so fast tap on move keys does not stop the avatar in some cases
2017-06-03 07:01:07 +01:00
67e540e05c
cross mouse buttons state
2017-06-03 04:28:43 +01:00
12a6625dc7
fix MouseDown in case it gets any use
2017-06-03 03:48:49 +01:00
7310b7625e
move a execution overlap guard to end of job
2017-06-02 12:58:04 +01:00
de153c2b62
Merge branch 'master' into httptests
2017-06-02 06:26:20 +01:00
b920f784ea
avoi null refs on tests simple clients
2017-06-01 00:14:59 +01:00
c68e7b6621
change child agents close control; disablesimulator is not a caps event message
2017-05-31 23:31:02 +01:00
5c156508e2
mantis 8182: update/fix GenerateRandomAnimation(). not updating libomv avatar data bc have no idea why do do have it, so leave it to who does know
2017-05-31 12:33:35 +01:00
55babdc160
Merge branch 'master' into httptests
2017-05-31 07:21:21 +01:00
7217c20291
we don't need to keep refs to baked textures assets
2017-05-31 07:12:03 +01:00
f5f0fa5d1f
we don't need to keep refs to baked textures assets
2017-05-31 06:18:05 +01:00
74da81890c
oops..
2017-05-31 06:04:59 +01:00
UbitUmarov