Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+1 |
|\ | |||||
| * | meaningless change to goose panda | Justin Clark-Casey (justincc) | 2011-10-11 | 1 | -0/+1 |
| | | |||||
* | | Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge | Melanie | 2011-10-12 | 1 | -6/+4 |
|\ \ | |/ | |||||
| * | remove unused LastAssetID from DynamicTextureUpdaer | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -6/+4 |
| | | |||||
* | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+6 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | ||||
| * | Added a setting to [Startup] section of config that will allow the simulator ↵ | Kevin Houlihan & Michelle Argus | 2011-09-24 | 1 | -3/+6 |
| | | | | | | | | | | | | to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region. | ||||
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Try disabling the inconsistent attachment state check to see if this ↵ | Justin Clark-Casey (justincc) | 2011-09-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | actually has an impact. The code in question is over three years old and just be catching an inconsistency rather than being wholly necessary. This commit still carries out the check and prints all the previous log warnings but a 'failure' no longer prevents avatar region crossing or teleport, and it doesn't give the client the error message. This will have some kind of impact on http://opensimulator.org/mantis/view.php?id=5672 | ||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -0/+87 |
|\ \ | |/ | |||||
| * | In WorldCommModule, replace the useless Attachments == null check with ↵ | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -2/+1 |
| | | | | | | | | Attachments.Count == 0 instead | ||||
| * | minor: seal up another instance of using the appearance list without locking | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -1/+1 |
| | | |||||
| * | Make SP.Attachments available as sp.GetAttachments() instead. | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -4/+8 |
| | | | | | | | | | | | | | | The approach here, as in other parts of OpenSim, is to return a copy of the list rather than the attachments list itself This prevents callers from forgetting to lock the list when they read it, as was happening in various parts of the codebase. It also improves liveness. This might improve attachment anomolies when performing region crossings. | ||||
| * | Add avatar and attachments to llRegionSay | BlueWall | 2011-08-20 | 1 | -4/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | llRegionSay will now message avatars on chan 0 and will message attachments on the avatar that listen on channels other than 0. This behavior is consistant with the LL implementation as tested on regions in Agni with one exception: this implementation does not include issue: https://jira.secondlife.com/browse/SCR-66? | ||||
| * | Add llRegionSayTo | BlueWall | 2011-08-19 | 1 | -0/+21 |
| | | | | | | | | | | | | | | llRegionSayTo(key target, integer channel, string messasge) Allows messages to be sent region-wide to a particular prim. | ||||
| * | Fix the cert validation handler so that it will not block other parts of | Melanie | 2011-05-13 | 1 | -2/+10 |
| | | | | | | | | the server doing ssl successfully. | ||||
* | | Some additional protection, it seems that responsedata needs to be locked, ↵ | Tom | 2011-05-26 | 1 | -2/+13 |
| | | | | | | | | but I can't immediately see where it's being accessed from another thread. For now, this will protect the server | ||||
* | | Also fix the locking of url.requests and tidy the locks in general | Tom | 2011-05-17 | 1 | -23/+31 |
| | | |||||
* | | Lock m_requestMap properly to prevent some nasty access errors and the ↵ | Tom | 2011-05-17 | 1 | -30/+51 |
| | | | | | | | | resulting downward spiral | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -5/+56 |
|\ \ | |/ | |||||
| * | Add support for llRequestSecureURL() if ssl is enabled | BlueWall | 2011-05-05 | 1 | -5/+56 |
| | | |||||
* | | Fix the cert validation handler so that it will not block other parts of | Melanie | 2011-04-17 | 1 | -2/+10 |
| | | | | | | | | the server doing ssl successfully. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 1 | -7/+35 |
|\ \ | |/ | |||||
| * | minor: remove now inaccurate comment | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -1/+1 |
| | | |||||
| * | minor: adjust some spacing and indentation | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -10/+10 |
| | | |||||
| * | Implimented HTTP_VERIFY_CERT for llHttpRequest | E. Allen Soard | 2011-04-11 | 1 | -3/+31 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-03 | 1 | -2/+0 |
|\ \ | |/ | |||||
| * | Comment out some startup logging lines to make up for the one I added ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -2/+0 |
| | | | | | | | | | | | | earlier on. Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy) | ||||
* | | Since we've plugged the leak, now increase URLs to 5000 since the limit is ↵ | Tom | 2011-03-21 | 1 | -1/+1 |
| | | | | | | | | being hit in several sims | ||||
* | | Repair x-query-string | Tom | 2011-02-03 | 1 | -1/+1 |
| | | |||||
* | | Fix cm/15627 : Don't block the entire URL on duplicate requests, just that ↵ | Tom | 2011-01-31 | 1 | -3/+3 |
| | | | | | | | | particular request! | ||||
* | | If llHTTPRequest results in an error, still attempt to get the response ↵ | Tom | 2011-01-29 | 1 | -1/+11 |
| | | | | | | | | text. If we can't (which implies the server is unreachable), return the StatusDescription as before. | ||||
* | | Ignore duplicate llHTTPResponse calls to the same request. Prevents response ↵ | Tom | 2011-01-29 | 1 | -4/+9 |
| | | | | | | | | corruption. Only the first llHTTPResponse call is obeyed, akin to SL. | ||||
* | | Significantly increase the total number of URL's available. In second life, ↵ | Tom | 2011-01-28 | 1 | -1/+1 |
| | | | | | | | | the limit is 15,000 URL's (one per prim), so i'd hope we can manage 1k. | ||||
* | | Fix a discrepancy vs. SL with parsing x-query-string | Tom | 2011-01-28 | 1 | -1/+8 |
| | | |||||
* | | Workaround to allow llHTTPRequest to POST data to Lighthttpd which doesn't ↵ | Tom | 2010-12-14 | 1 | -0/+4 |
| | | | | | | | | support Expect: 100-Continue | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -11/+12 |
|\ \ | |/ | |||||
| * | Normalization of OSSL function names. | Marck | 2010-12-10 | 1 | -11/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the following replacement functions for compliance to the OSSL standards stated on the wiki: osGetTerrainHeight osSetTerrainHeight osGetSunParam osSetSunParam osSetPenColor The functions that do not comply to the standard give a warning when used but work normally otherwise. The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour". The following two functions have been renamed because they are not enabled yet aynway: osWindParamSet => osSetWindParam osWindParamGet => osGetWindParam | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -32/+32 |
|\ \ | |/ | |||||
| * | Thanks Snoopy for a patch that addresses Mantis #0005165: ↵ | dahlia | 2010-11-02 | 1 | -32/+32 |
| | | | | | | | | | | | | osSetDynamicTextureURL crashed region server Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
| * | Change the way IRegionModule us referenced by IEmailModule to | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | | | | | allow later conversion to new style | ||||
* | | Now, fix the slash issue the right way. Our URLs now work like SL's | Melanie Thielker | 2010-07-03 | 1 | -5/+5 |
| | | |||||
* | | Re-add the slashes at the end of the URL. Too much depends on them | Melanie Thielker | 2010-07-03 | 1 | -2/+2 |
| | | |||||
* | | ANother stab at LSL compatibility | Melanie Thielker | 2010-07-01 | 1 | -1/+1 |
| | | |||||
* | | Remove trailing slash from HTTP URLs to be compatible with SL | Melanie Thielker | 2010-07-01 | 1 | -1/+1 |
| | | |||||
* | | Change the way IRegionModule us referenced by IEmailModule to | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
|/ | | | | allow later conversion to new style | ||||
* | minor: Print out port that http servers are using | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -6/+6 |
| | | | | do this in callers so that we know who is setting up these things | ||||
* | Fixed several unhandled exceptions and performance issues with ↵ | John Hurliman | 2010-03-16 | 1 | -11/+9 |
| | | | | PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time | ||||
* | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 1 | -1/+1 |
| | |||||
* | * Adds CreatorID to asset metadata. This is just the plumbing to support ↵ | John Hurliman | 2010-02-22 | 1 | -1/+2 |
| | | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it | ||||
* | Endline fix | Teravus Ovares (Dan Olivares) | 2010-02-06 | 1 | -12/+12 |
| |