Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into httptests | UbitUmarov | 2017-01-07 | 2 | -33/+20 |
|\ | |||||
| * | Fix errors introduced by incomplete understanding of what folded perms are | Melanie Thielker | 2017-01-06 | 1 | -19/+0 |
| | | |||||
| * | fix/simplify validation of god_data update field | UbitUmarov | 2017-01-06 | 1 | -14/+20 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-01-06 | 1 | -4/+26 |
|\ \ | |/ | |||||
| * | Restructure god level and permissions | Melanie Thielker | 2017-01-06 | 1 | -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 ↵ | UbitUmarov | 2017-01-05 | 1 | -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 merge | UbitUmarov | 2017-01-05 | 116 | -1325/+1325 |
|\ \ | |/ | |||||
| * | Massive tab and trailing space cleanup | Melanie Thielker | 2017-01-05 | 116 | -1323/+1323 |
| | | |||||
| * | a few changes to Gods ( ie administrators) control | UbitUmarov | 2017-01-05 | 1 | -2/+2 |
| | | |||||
* | | some cleanup, use more using(), more checks so http request mem stream is closed | UbitUmarov | 2016-12-30 | 1 | -42/+27 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-30 | 2 | -4/+10 |
|\ \ | |/ | |||||
| * | Add negative caching to flotsam cache. Prevents scripts from hammering the ↵ | Melanie Thielker | 2016-12-29 | 1 | -0/+6 |
| | | | | | | | | asset server | ||||
| * | Actually rename the file, too | Melanie Thielker | 2016-12-29 | 1 | -0/+0 |
| | | |||||
| * | Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache ↵ | Melanie Thielker | 2016-12-29 | 2 | -4/+4 |
| | | | | | | | | is long gone. | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-25 | 2 | -1/+6 |
|\ \ | |/ | |||||
| * | add missing file | UbitUmarov | 2016-12-23 | 1 | -0/+1 |
| | | |||||
| * | check if a parcelID is a encoded position data or a true UUID. This may ↵ | UbitUmarov | 2016-12-23 | 1 | -1/+5 |
| | | | | | | | | fail, just reducing the odds. | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-23 | 1 | -0/+14 |
|\ \ | |/ | |||||
| * | take UserProfileModule out on onMakeRoot event, add some caching | UbitUmarov | 2016-12-21 | 1 | -0/+14 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-18 | 1 | -0/+134 |
|\ \ | |/ | |||||
| * | and yes HG uri again | UbitUmarov | 2016-12-16 | 1 | -0/+20 |
| | | |||||
| * | ok.. another try on the HG uri | UbitUmarov | 2016-12-16 | 1 | -0/+114 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-14 | 3 | -28/+24 |
|\ \ | |/ | |||||
| * | Remove the AllowAlternatePorts option. It wasn't implemented anyway. | Melanie Thielker | 2016-12-13 | 1 | -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 Thielker | 2016-12-12 | 1 | -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 Thielker | 2016-12-12 | 1 | -3/+4 |
| | | | | | | | | It is set to false implicitly on existing regions. | ||||
| * | Make resolving the IP on startup optional. | Melanie Thielker | 2016-12-12 | 1 | -0/+19 |
| | | | | | | | | Adds ResolveAddress boolean to regions.ini | ||||
| * | If a region address is resolveable to a single address, resolve it on | Melanie Thielker | 2016-12-11 | 1 | -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 Thielker | 2016-12-10 | 1 | -0/+2 |
| | | | | | | | | | | Passwordless connection is perfectly legal and makes sense within a container. | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-09 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | JsonRpc: don't try to connect to a empty uri | UbitUmarov | 2016-12-08 | 1 | -0/+3 |
| | | |||||
* | | provide remote SSLcommonName to xmlRpcRequest methods, but in a away it can ↵ | UbitUmarov | 2016-12-09 | 1 | -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 ↵ | UbitUmarov | 2016-12-09 | 1 | -0/+4 |
| | | | | | | | | callback | ||||
* | | remove not needed sslport parameter | UbitUmarov | 2016-12-08 | 1 | -6/+8 |
| | | |||||
* | | add SSL certs validation options for regions to allow simple encriptation ↵ | UbitUmarov | 2016-12-07 | 1 | -1/+29 |
| | | | | | | | | without any peer autentification using simple homemade (or even shared) certs. | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-04 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | The new Constant: integer OBJECT_REZZER_KEY = 32; | Mandarinka Tasty | 2016-12-04 | 1 | -0/+11 |
| | | | | | | | | | | Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt> | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-02 | 1 | -40/+61 |
|\ \ | |/ | |||||
| * | a few changes to cache.cs ( currently not much used ) | UbitUmarov | 2016-12-01 | 1 | -40/+61 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-11-27 | 5 | -15/+67 |
|\ \ | |/ | |||||
| * | revert changes to asset desc size, my bad.. this field will possible go ↵ | UbitUmarov | 2016-11-24 | 1 | -14/+2 |
| | | | | | | | | away in future | ||||
| * | add to SynchronousRestFormsRequester a keepalive disable option, and make ↵ | UbitUmarov | 2016-11-23 | 1 | -11/+4 |
| | | | | | | | | use of it on some friends conns | ||||
| * | close a resource on jobengine.close() | UbitUmarov | 2016-11-22 | 1 | -1/+2 |
| | | |||||
| * | Minor fix to region default landing point sanity check | AliciaRaven | 2016-11-22 | 1 | -2/+2 |
| | | |||||
| * | Include new Region.ini option for DefaultLandingPoint for teleports with no ↵ | AliciaRaven | 2016-11-22 | 1 | -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 size | UbitUmarov | 2016-11-22 | 1 | -2/+14 |
| | | |||||
| * | remove a wrong virtual dec ( no overides, and cant really have if used on a ↵ | UbitUmarov | 2016-11-21 | 1 | -1/+1 |
| | | | | | | | | constructor like in assetlandmark) | ||||
| * | Change some minor log messages to debug level in Rest client code. | AliciaRaven | 2016-11-20 | 1 | -2/+2 |
| | | |||||
* | | fix pool parameters for httptests | UbitUmarov | 2016-11-19 | 1 | -1/+1 |
| | | |||||
* | | merge conflits | UbitUmarov | 2016-11-19 | 6 | -74/+285 |
|\ \ | |/ |