1b7aee89d3
Merge branch 'master' into httptests
2017-05-11 23:14:02 +01:00
97d02ecf32
remove a coment added by mistake
2017-05-11 21:44:57 +01:00
b8138c37d3
hide a nonsense option
2017-05-11 21:41:33 +01:00
09c4952c6d
merge
2017-05-09 23:22:36 +01:00
731510c305
let .net decide GC mode from its defaults on the platform
2017-05-09 18:27:06 +01:00
52d4cf692c
update mysql connector to v6.9.9 .net4.0
2017-05-09 12:22:42 +01:00
957ca41b13
remove file bin/Mono.Posix.dll that causes problems with mono
2017-05-09 11:58:07 +01:00
4b3d57e964
update mysql connector to v6.9.9 .net4.5
2017-05-08 19:08:20 +01:00
5622b174c4
update mysql connector to v6.9.9 .net4.0
2017-05-08 04:18:17 +01:00
f358b39ef5
update httpserver
2017-05-08 04:00:47 +01:00
11f6d28a06
fix merge
2017-05-07 04:21:33 +01:00
8e30016841
revert to older CSJ2K.dll since new seems have issues on linux with existent textures/sculpts
2017-05-05 22:24:05 +01:00
832ca518d7
fix merge
2017-05-03 03:52:55 +01:00
1bfe9354e3
coment out optional fields that should be edited and uncomented if needed
2017-05-02 15:45:54 +01:00
55f7986b44
fix some comments
2017-05-02 13:14:26 +01:00
6c2f8176ae
change opensim.ini.example setting of ExternalHostNameForLSL to a defualt
2017-05-02 11:39:29 +01:00
3b01c209b2
Update libOMV
2017-04-25 16:24:07 -07:00
a680d8b8d7
fix merge
2017-04-25 17:59:53 +01:00
3b33a90e37
update ode binaries for windows
2017-04-21 13:49:25 +01:00
b498d554e1
update ode binaries for linux; add a minimal velocity for bounce
2017-04-19 21:50:32 -04:00
84c9125016
update ode binaries for windows; add a minimal velocity for bounce
2017-04-20 02:25:22 +01:00
52e03ee5bd
update ubODE for Linux x86 and x86_64 to include lasted ODE 0.13.2
2017-04-19 13:24:38 -04:00
49884b94a7
update ODE binaries for windows. Other platforms need to compile from opensim-libs repo, folder ODE-OpenSim-0.13.2, read file OPENSIM-README.txt. Remove code to reduce bounce on non physical placement, new unmanaged should handle that
2017-04-18 00:50:55 +01:00
22e9647748
update ode binaries for windows
2017-04-14 03:45:03 +01:00
040037d713
update ode.dll for windows. Other platforms need fo be compiled from opensim-libs repo, folder ODE-OpenSim.0.13.2. This adds OsTerrain, a replacevment for Heightfield that ubOde can use. Its already rotated as needed and has a diferent Sphere collider, rest is still almost identical. Keep previus ode version in case this goes wrong.
2017-04-12 06:50:34 +01:00
c58f2167bb
fix osTeleportObject OSFunctionThreatLevel setting on osslEnable.ini
2017-04-05 13:55:51 +01:00
2805cb9dec
give osTeleportObject proper OSFunctionThreatLevel setting on osslEnable.ini
2017-04-05 01:15:44 +01:00
75915bd0f3
Add the ability to post to and act uponconfiguration in etcd
...
Etcd is a distributed, highly available name-value store that is
the basis of many clustered applications. However, it can also be
run on a standalone machine. Using etcd allows live monitoring
and possibly changing configuration while the sim is running.
2017-03-31 14:38:41 +01:00
4e465002a2
Make the file based log file format sane for the casual user
...
Developer-oriented format is left commented so interested users and devs
can reactivate it.
2017-03-31 14:38:41 +01:00
d96bcd8264
add a bit clarification about grid private port protection
2017-01-09 18:22:39 +00:00
45695ef2e3
Merge branch 'master' into httptests
2017-01-08 02:00:24 +00:00
8662606f7b
add the new GOD ossl option to osslEnable.ini
2017-01-07 23:38:55 +00:00
2d0860ac51
rename OSSL enable option GOD as ACTIVE_GOD so its use is more clear
2017-01-07 22:51:56 +00:00
e2167716aa
change OSSL enable option GOD to use IsGod, so it means a active god, as my original idea
2017-01-07 21:44:01 +00:00
add27a503e
Merge branch 'master' into httptests
2017-01-07 16:55:03 +00:00
0b912b2acc
Remove parcel_owner_is_god option. It is conceptually wrong and with
...
limited use. Relevant parcel owners can just be made estate managers with better regions management logic
2017-01-06 15:00:55 +00:00
6172446e2a
Merge branch 'master' into httptests
2017-01-06 01:09:42 +00:00
ad8915f154
Restructure god level and permissions
...
Create a class GodController which controls all aspects of god level,
viewer modes and user levels at ScenePresence level.
2017-01-06 00:55:14 +00:00
82a26671b8
Merge branch 'master' into httptests
2017-01-03 11:24:16 +00:00
f03a6bbc61
Create a generic way for passing constructor args to plugins
...
The old syntax didn't allow for any parameters except for services
listed in the ServiceList. Now, services loaded by other services can
also be made to use different ini sections or have additional paramters.
Syntax is: [<ExtraParam>@]...<DllName>[:<ClassName>]
2017-01-02 17:47:20 +00:00
7abb0477ed
Replaced OpenMetaverse libs/xmls with new ones. Also added a file in openmetaverse_data that was added recently to libomv and was missing.
2016-12-31 08:58:06 -08:00
5fc3605955
some cleanup, use more using(), more checks so http request mem stream is closed
2016-12-30 07:15:28 +00:00
1107d0ccb9
Merge branch 'master' into httptests
2016-12-30 02:20:52 +00:00
2836f16ae1
fix typos
2016-12-30 02:14:16 +00:00
2a01173715
Merge branch 'master' into httptests
2016-12-30 01:52:02 +00:00
e0b5135010
Add a MaxRetries option to the inventory connector.
...
If clustered services are used, another try would go to another server
and may succeed.
2016-12-29 16:29:44 +00:00
07b48fd58c
Add negative caching to flotsam cache. Prevents scripts from hammering the asset server
2016-12-29 15:47:46 +00:00
1ffcc59818
gc is also a unwanted cache, so use it. With this, memcache with short expires is no longer needed
2016-12-29 03:10:10 +00:00
bf1f4d1384
fix typos (thanks you know who)
2016-12-25 16:51:54 +00:00
52e7fc31f7
fix typos (thanks you know who)
2016-12-25 16:48:27 +00:00
UbitUmarov