Commit Graph

4741 Commits

Author SHA1 Message Date
UbitUmarov
add27a503e Merge branch 'master' into httptests 2017-01-07 16:55:03 +00:00
Melanie Thielker
4385d7d693 Fix errors introduced by incomplete understanding of what folded perms are 2017-01-06 13:17:43 +00:00
UbitUmarov
e5a3d85bc7 fix/simplify validation of god_data update field 2017-01-06 03:45:47 +00:00
UbitUmarov
6172446e2a Merge branch 'master' into httptests 2017-01-06 01:09:42 +00:00
Melanie Thielker
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
UbitUmarov
1fb01a0099 add config option automatic_gods. With this option true, users that can be Gods will have that level automaticly without the need request on viewer; Propagate current god level to nearby regions (with local checks) 2017-01-05 21:21:15 +00:00
UbitUmarov
254b26a7d5 fix merge 2017-01-05 19:32:57 +00:00
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
cbc3501246 a few changes to Gods ( ie administrators) control 2017-01-05 18:02:59 +00:00
UbitUmarov
5fc3605955 some cleanup, use more using(), more checks so http request mem stream is closed 2016-12-30 07:15:28 +00:00
UbitUmarov
2a01173715 Merge branch 'master' into httptests 2016-12-30 01:52:02 +00:00
Melanie Thielker
07b48fd58c Add negative caching to flotsam cache. Prevents scripts from hammering the asset server 2016-12-29 15:47:46 +00:00
Melanie Thielker
ec4c258794 Actually rename the file, too 2016-12-29 12:36:13 +00:00
Melanie Thielker
f021c64eb0 Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache is long gone. 2016-12-29 12:34:09 +00:00
UbitUmarov
1b95ada105 Merge branch 'master' into httptests 2016-12-25 05:51:08 +00:00
UbitUmarov
679d52ced6 add missing file 2016-12-23 19:41:57 +00:00
UbitUmarov
b6266c6a1d check if a parcelID is a encoded position data or a true UUID. This may fail, just reducing the odds. 2016-12-23 14:23:07 +00:00
UbitUmarov
86cc02f33e Merge branch 'master' into httptests 2016-12-23 02:53:58 +00:00
UbitUmarov
330369f904 take UserProfileModule out on onMakeRoot event, add some caching 2016-12-21 22:27:48 +00:00
UbitUmarov
82fc8e1a36 Merge branch 'master' into httptests 2016-12-18 05:03:27 +00:00
UbitUmarov
9b9f93c4b2 and yes HG uri again 2016-12-16 20:31:07 +00:00
UbitUmarov
e2d46c060c ok.. another try on the HG uri 2016-12-16 03:38:20 +00:00
UbitUmarov
18a292ad02 Merge branch 'master' into httptests 2016-12-14 13:35:53 +00:00
Melanie Thielker
69776aa70c Remove the AllowAlternatePorts option. It wasn't implemented anyway.
Instead, handle the port being 0 as "any port" and assign a random
port for regions in that case.
2016-12-13 19:47:26 +00:00
Melanie Thielker
1388ac2ef7 Rename charterMember to membershipType to show what it actually is.
This field started out as a simple flag in the protocol to indicate a
user being a SL charter member. It has since then taken on additional
functionality that means that the name is no longer appropriate.
2016-12-12 11:09:38 +00:00
Melanie Thielker
bebfbd0600 Only ask for the new parameter when starting from scratch.
It is set to false implicitly on existing regions.
2016-12-12 10:14:16 +00:00
Melanie Thielker
9ef9dde0f3 Make resolving the IP on startup optional.
Adds ResolveAddress boolean to regions.ini
2016-12-12 10:08:31 +00:00
Melanie Thielker
ba61b64c42 If a region address is resolveable to a single address, resolve it on
startup and use that address
This change facilitates running opensim within containers and VMs where
the external address isn't that of the VM/container but that of the
host.
2016-12-11 20:51:40 +00:00
Melanie Thielker
5ad8bceb1d Fix OpenSim bombing when a MySQL connection string doesn't contain a password.
Passwordless connection is perfectly legal and makes sense within a
container.
2016-12-10 18:36:10 +00:00
UbitUmarov
8114ff9d06 Merge branch 'master' into httptests 2016-12-09 04:50:07 +00:00
UbitUmarov
30dccd57cd provide remote SSLcommonName to xmlRpcRequest methods, but in a away it can be detected/parsed. This is used by some external modules like DTLNSLMoneyServer. But this module does need to change on this ( and it cannot override default validation rules, it needs to do it on its httplistener with method provided in previus commits 2016-12-09 04:32:59 +00:00
UbitUmarov
6627da693e suport client certificate validation per listenner, with a supplied static callback 2016-12-09 04:07:06 +00:00
UbitUmarov
18ff3eb227 JsonRpc: don't try to connect to a empty uri 2016-12-08 23:56:14 +00:00
UbitUmarov
806e75eefb remove not needed sslport parameter 2016-12-08 23:39:55 +00:00
UbitUmarov
3a81642d97 add SSL certs validation options for regions to allow simple encriptation without any peer autentification using simple homemade (or even shared) certs. 2016-12-07 13:30:07 +00:00
UbitUmarov
1680425f4d Merge branch 'master' into httptests 2016-12-04 23:39:15 +00:00
Mandarinka Tasty
7c566dca5a The new Constant: integer OBJECT_REZZER_KEY = 32;
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2016-12-04 17:18:56 +00:00
UbitUmarov
b981ac42bc Merge branch 'master' into httptests 2016-12-02 13:51:30 +00:00
UbitUmarov
cfb98050f7 a few changes to cache.cs ( currently not much used ) 2016-12-01 03:43:49 +00:00
UbitUmarov
877d3092b4 Merge branch 'master' into httptests 2016-11-27 15:14:34 +00:00
UbitUmarov
5202ae7bb4 revert changes to asset desc size, my bad.. this field will possible go away in future 2016-11-24 14:39:08 +00:00
UbitUmarov
b3eda582ec add to SynchronousRestFormsRequester a keepalive disable option, and make use of it on some friends conns 2016-11-23 19:30:55 +00:00
UbitUmarov
59f6353ac1 close a resource on jobengine.close() 2016-11-22 22:29:13 +00:00
AliciaRaven
1a6cddf807 Minor fix to region default landing point sanity check 2016-11-22 21:23:01 +00:00
AliciaRaven
94e48838d5 Include new Region.ini option for DefaultLandingPoint for teleports with no coords specified.
This is useful when using a Telehub would be to restrictive as it would block landmarks and map teleports. This location is only ever used when no coordinates are provided. If config value not set, the previous default of 128,128 is used.
2016-11-22 15:31:45 +00:00
UbitUmarov
7524c7729f change asset description max size 2016-11-22 01:34:07 +00:00
UbitUmarov
8c19ea910a remove a wrong virtual dec ( no overides, and cant really have if used on a constructor like in assetlandmark) 2016-11-21 23:34:33 +00:00
AliciaRaven
1d998a770b Change some minor log messages to debug level in Rest client code. 2016-11-20 13:52:06 +00:00
UbitUmarov
08dee3fa34 fix pool parameters for httptests 2016-11-19 15:46:47 +00:00
UbitUmarov
7cb3d583a9 merge conflits 2016-11-19 15:45:41 +00:00