aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-01-072-33/+20
|\
| * Fix errors introduced by incomplete understanding of what folded perms areMelanie Thielker2017-01-061-19/+0
| |
| * fix/simplify validation of god_data update fieldUbitUmarov2017-01-061-14/+20
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-01-061-4/+26
|\ \ | |/
| * Restructure god level and permissionsMelanie Thielker2017-01-061-8/+25
| | | | | | | | | | Create a class GodController which controls all aspects of god level, viewer modes and user levels at ScenePresence level.
| * add config option automatic_gods. With this option true, users that can be ↵UbitUmarov2017-01-051-0/+5
| | | | | | | | Gods will have that level automaticly without the need request on viewer; Propagate current god level to nearby regions (with local checks)
* | fix mergeUbitUmarov2017-01-05116-1325/+1325
|\ \ | |/
| * Massive tab and trailing space cleanupMelanie Thielker2017-01-05116-1323/+1323
| |
| * a few changes to Gods ( ie administrators) controlUbitUmarov2017-01-051-2/+2
| |
* | some cleanup, use more using(), more checks so http request mem stream is closedUbitUmarov2016-12-301-42/+27
| |
* | Merge branch 'master' into httptestsUbitUmarov2016-12-302-4/+10
|\ \ | |/
| * Add negative caching to flotsam cache. Prevents scripts from hammering the ↵Melanie Thielker2016-12-291-0/+6
| | | | | | | | asset server
| * Actually rename the file, tooMelanie Thielker2016-12-291-0/+0
| |
| * Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache ↵Melanie Thielker2016-12-292-4/+4
| | | | | | | | is long gone.
* | Merge branch 'master' into httptestsUbitUmarov2016-12-252-1/+6
|\ \ | |/
| * add missing fileUbitUmarov2016-12-231-0/+1
| |
| * check if a parcelID is a encoded position data or a true UUID. This may ↵UbitUmarov2016-12-231-1/+5
| | | | | | | | fail, just reducing the odds.
* | Merge branch 'master' into httptestsUbitUmarov2016-12-231-0/+14
|\ \ | |/
| * take UserProfileModule out on onMakeRoot event, add some cachingUbitUmarov2016-12-211-0/+14
| |
* | Merge branch 'master' into httptestsUbitUmarov2016-12-181-0/+134
|\ \ | |/
| * and yes HG uri againUbitUmarov2016-12-161-0/+20
| |
| * ok.. another try on the HG uriUbitUmarov2016-12-161-0/+114
| |
* | Merge branch 'master' into httptestsUbitUmarov2016-12-143-28/+24
|\ \ | |/
| * Remove the AllowAlternatePorts option. It wasn't implemented anyway.Melanie Thielker2016-12-131-32/+2
| | | | | | | | | | Instead, handle the port being 0 as "any port" and assign a random port for regions in that case.
| * Rename charterMember to membershipType to show what it actually is.Melanie Thielker2016-12-121-1/+1
| | | | | | | | | | | | 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.
| * Only ask for the new parameter when starting from scratch.Melanie Thielker2016-12-121-3/+4
| | | | | | | | It is set to false implicitly on existing regions.
| * Make resolving the IP on startup optional.Melanie Thielker2016-12-121-0/+19
| | | | | | | | Adds ResolveAddress boolean to regions.ini
| * If a region address is resolveable to a single address, resolve it onMelanie Thielker2016-12-111-1/+5
| | | | | | | | | | | | | | 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.
| * Fix OpenSim bombing when a MySQL connection string doesn't contain a password.Melanie Thielker2016-12-101-0/+2
| | | | | | | | | | Passwordless connection is perfectly legal and makes sense within a container.
* | Merge branch 'master' into httptestsUbitUmarov2016-12-091-0/+3
|\ \ | |/
| * JsonRpc: don't try to connect to a empty uriUbitUmarov2016-12-081-0/+3
| |
* | provide remote SSLcommonName to xmlRpcRequest methods, but in a away it can ↵UbitUmarov2016-12-091-0/+11
| | | | | | | | 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
* | suport client certificate validation per listenner, with a supplied static ↵UbitUmarov2016-12-091-0/+4
| | | | | | | | callback
* | remove not needed sslport parameterUbitUmarov2016-12-081-6/+8
| |
* | add SSL certs validation options for regions to allow simple encriptation ↵UbitUmarov2016-12-071-1/+29
| | | | | | | | without any peer autentification using simple homemade (or even shared) certs.
* | Merge branch 'master' into httptestsUbitUmarov2016-12-041-0/+11
|\ \ | |/
| * The new Constant: integer OBJECT_REZZER_KEY = 32;Mandarinka Tasty2016-12-041-0/+11
| | | | | | | | | | Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* | Merge branch 'master' into httptestsUbitUmarov2016-12-021-40/+61
|\ \ | |/
| * a few changes to cache.cs ( currently not much used )UbitUmarov2016-12-011-40/+61
| |
* | Merge branch 'master' into httptestsUbitUmarov2016-11-275-15/+67
|\ \ | |/
| * revert changes to asset desc size, my bad.. this field will possible go ↵UbitUmarov2016-11-241-14/+2
| | | | | | | | away in future
| * add to SynchronousRestFormsRequester a keepalive disable option, and make ↵UbitUmarov2016-11-231-11/+4
| | | | | | | | use of it on some friends conns
| * close a resource on jobengine.close()UbitUmarov2016-11-221-1/+2
| |
| * Minor fix to region default landing point sanity checkAliciaRaven2016-11-221-2/+2
| |
| * Include new Region.ini option for DefaultLandingPoint for teleports with no ↵AliciaRaven2016-11-221-0/+58
| | | | | | | | | | | | 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.
| * change asset description max sizeUbitUmarov2016-11-221-2/+14
| |
| * remove a wrong virtual dec ( no overides, and cant really have if used on a ↵UbitUmarov2016-11-211-1/+1
| | | | | | | | constructor like in assetlandmark)
| * Change some minor log messages to debug level in Rest client code.AliciaRaven2016-11-201-2/+2
| |
* | fix pool parameters for httptestsUbitUmarov2016-11-191-1/+1
| |
* | merge conflitsUbitUmarov2016-11-196-74/+285
|\ \ | |/