Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into httptests | UbitUmarov | 2017-05-31 | 2 | -20/+3 |
|\ | |||||
| * | oops.. | UbitUmarov | 2017-05-31 | 1 | -1/+1 |
| | | |||||
| * | remove the option to store baked textures on assets service, thats suicide ↵ | UbitUmarov | 2017-05-31 | 2 | -20/+3 |
| | | | | | | | | use xbakes | ||||
* | | fix merge | UbitUmarov | 2017-05-07 | 2 | -11/+0 |
|\ \ | |/ | |||||
| * | dispose some MemoryStreams | UbitUmarov | 2017-05-06 | 2 | -11/+0 |
| | | |||||
* | | fix merge | UbitUmarov | 2017-01-05 | 17 | -93/+93 |
|\ \ | |/ | |||||
| * | Massive tab and trailing space cleanup | Melanie Thielker | 2017-01-05 | 17 | -94/+94 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-28 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | robust textures add missing returns or redir case | UbitUmarov | 2016-12-26 | 1 | -0/+2 |
| | | |||||
* | | some cleanup | UbitUmarov | 2016-12-27 | 1 | -39/+2 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-06 | 2 | -23/+7 |
|\ \ | |/ | |||||
| * | jenkins likes null httplisteners | UbitUmarov | 2016-12-06 | 1 | -1/+1 |
| | | |||||
| * | remove redundante check for ssl listener | UbitUmarov | 2016-12-06 | 2 | -23/+7 |
| | | |||||
* | | save a few lists scaning | UbitUmarov | 2016-12-06 | 1 | -58/+80 |
| | | |||||
* | | merge conflits | UbitUmarov | 2016-11-19 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | a few more changes on potencial mem issues | UbitUmarov | 2016-11-18 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-09-03 | 3 | -33/+43 |
|\ \ | |/ | |||||
| * | potencial null ref | UbitUmarov | 2016-08-24 | 1 | -0/+3 |
| | | |||||
| * | workaround potencial memory leak | UbitUmarov | 2016-08-22 | 2 | -33/+40 |
| | | |||||
* | | merge issue | UbitUmarov | 2016-08-19 | 2 | -34/+26 |
|\ \ | |/ | |||||
| * | add GetUsersNames(string[] ids) to UserManagement. Make GetDisplayNames cap ↵ | UbitUmarov | 2016-08-17 | 2 | -34/+26 |
| | | | | | | | | use it so several IDs are handle on a single call. Since there is no grid side suport, no much gain still | ||||
* | | let FS get a answer to folder uuid.zero, (still seems a no op); send | UbitUmarov | 2016-07-19 | 1 | -35/+14 |
| | | | | | | | | Library folders list" | ||||
* | | fix a typo | UbitUmarov | 2016-07-19 | 1 | -1/+1 |
| | | |||||
* | | some cleanup on FetchInvDescHandler | UbitUmarov | 2016-07-19 | 1 | -148/+22 |
| | | |||||
* | | don't loose inventory items when there are bad folders | UbitUmarov | 2016-07-17 | 1 | -55/+43 |
|/ | |||||
* | Finally remove the requirement for an InventoryItem/FolderBase object to | Melanie Thielker | 2016-07-04 | 2 | -26/+8 |
| | | | | | | | | be passed into inventory queries. This makes the API more homogenous and also will more clearly show coding errors related to HG inventory where the .Owner field has a meaning for a query but wasn't always set. | ||||
* | Fix a dumb mistake | Melanie Thielker | 2016-06-21 | 1 | -1/+1 |
| | |||||
* | Make some more modules inheritable | Melanie Thielker | 2016-06-21 | 1 | -3/+3 |
| | |||||
* | Allow default permissions from the viewer to be applied to uploaded objects. | Melanie Thielker | 2016-04-29 | 1 | -0/+4 |
| | | | | Make inventory items reflect coorect permissions immediately unstead of after relog | ||||
* | Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global ↵ | Diva Canto | 2016-02-21 | 1 | -1/+1 |
| | | | | replace anymore. | ||||
* | remove some compile warnings increasing total number by 2 | UbitUmarov | 2015-11-21 | 1 | -5/+1 |
| | |||||
* | work around some 'tests' error: contents of link folders are no longer sent | UbitUmarov | 2015-11-16 | 1 | -1/+2 |
| | |||||
* | On to 0.8.3! | Diva Canto | 2015-10-18 | 1 | -1/+1 |
| | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | ||||
* | Fixed Robust-bound GetTexture handler that had been knocked off with the new ↵ | Diva Canto | 2015-10-14 | 2 | -3/+434 |
| | | | | sim-bound handler that uses a Poll service. Rather than hammering both handlers into one single class, I'm splitting them into 2 classes, because they are considerably different. | ||||
* | dont send of the contents of LinkFolders also on Multiple folder fetch. ↵ | UbitUmarov | 2015-10-06 | 1 | -3/+3 |
| | | | | Outfits changes still seem to work, except FS that doesnt delete the links to previus outfits, as singularity does | ||||
* | dont send of the contents of LinkFolders | UbitUmarov | 2015-10-06 | 1 | -0/+5 |
| | |||||
* | send DisplayNames dates in UTC and not region local time. send a next ↵ | UbitUmarov | 2015-10-05 | 1 | -2/+5 |
| | | | | update date that can be parsed and make it also in future so name edition is blocked since we don't suport them. (singu fails to display date, and seems to fail converting utc to local time | ||||
* | try to better merge avn and os fetchinventory and fetchinvdescendents | UbitUmarov | 2015-09-12 | 3 | -445/+92 |
| | |||||
* | inventory mess return to the state before divas cache issue | UbitUmarov | 2015-09-11 | 6 | -87/+1343 |
| | |||||
* | change to avn fecthinventory and webfecth.. code | UbitUmarov | 2015-09-11 | 6 | -1343/+87 |
| | |||||
* | comment a large debug message | UbitUmarov | 2015-09-04 | 1 | -1/+1 |
| | |||||
* | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 4 | -178/+61 |
| | |||||
* | bad merge? | UbitUmarov | 2015-09-01 | 12 | -150/+797 |
|\ | |||||
| * | turn off KeepAlive | UbitUmarov | 2015-08-24 | 2 | -8/+8 |
| | | |||||
| * | do keepalive on mesh and texture GET. Dont use reusecontext any where. | UbitUmarov | 2015-08-18 | 2 | -8/+8 |
| | | | | | | | | | | | | setting of keepalive is wrong, it should follow the requested one ( or always as http1.1) only deny if needed (errors). KeepAlive may increase stress on number of avaiable file descritors. | ||||
| * | lso remove caps with "PUT" http method | UbitUmarov | 2014-10-14 | 1 | -0/+1 |
| | | |||||
| * | explicitly force a reset to the event on creation | UbitUmarov | 2014-08-09 | 1 | -1/+2 |
| | | | | | | | | #Please enter the commit message for your changes. Lines starting | ||||
| * | Merge branch 'master' into careminster | Melanie | 2013-11-23 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat | ||||
| * \ | Merge branch 'master' into careminster | Melanie | 2013-10-06 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | ||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-24 | 1 | -6/+87 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs |