Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'careminster-presence-refactor' of ↵ | sacha | 2010-12-23 | 2 | -19/+106 |
|\ | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 2 | -18/+43 |
| |\ | |||||
| | * | Added a counter to NewFiles in Xfers to account for simultaneous object ↵ | Diva Canto | 2010-12-22 | 1 | -16/+42 |
| | | | | | | | | | | | | inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer. | ||||
| | * | Fix a broken format on an error message. Also replace yet another e.Message | Melanie | 2010-12-22 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | with e.ToString(). e.Message is USELESS, it doesn't tell us what happened where, we should use e.ToSTring() everywhere | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -4/+66 |
| |\ \ | | |/ | |||||
| | * | * Adds AbortXfer to the ClientAPI mix | Teravus Ovares (Dan Olivares) | 2010-12-21 | 1 | -4/+66 |
| | | | | | | | | | | | | | | | | | | * Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time. * Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes. * The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own. | ||||
* | | | reactivating some traces to track a dead thread | sacha | 2010-12-23 | 1 | -2/+2 |
|/ / | | | | | | | seen @ NT and Otaku | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-20 | 2 | -9/+7 |
|\ \ | |/ | |||||
| * | uncomment "load iar" help lines which added the --merge option | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -5/+3 |
| | | |||||
| * | minor: add [-p|--profile=<url>] to usage line that pops up if save iar ↵ | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -3/+3 |
| | | | | | | | | console command isn't valid | ||||
| * | Raise maximum iar version that master can load to 1.x, so that it can load ↵ | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -1/+1 |
| | | | | | | | | its own iars (oops) | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-12-15 | 4 | -34/+165 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 3 | -34/+161 |
| |\ \ | | |/ | |||||
| | * | Made the map thread request the map items asynchronously, as the name ↵ | Diva Canto | 2010-12-14 | 1 | -9/+71 |
| | | | | | | | | | | | | suggested -- but with a cap of 20 async requests max at any given time. | ||||
| | * | Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for ↵ | Diva Canto | 2010-12-14 | 3 | -25/+90 |
| | | | | | | | | | | | | grided sims. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-12-14 | 3 | -120/+172 |
| | |\ | |||||
| | | * | Fix a small bug in ban list handling | Melanie | 2010-12-13 | 1 | -0/+2 |
| | | | | |||||
| | | * | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 3 | -120/+170 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work. | ||||
| | * | | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being ↵ | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -0/+16 |
| | |/ | | | | | | | | | | | | | | | | used by a 3rd party region module and contains non-obvious attachment specific code There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout | ||||
| * | | Workaround to allow llHTTPRequest to POST data to Lighthttpd which doesn't ↵ | Tom | 2010-12-14 | 1 | -0/+4 |
| | | | | | | | | | | | | support Expect: 100-Continue | ||||
* | | | Fix casts in llSetPayPrice | Melanie | 2010-12-15 | 1 | -1/+10 |
|/ / | |||||
* | | Fix a small bug in ban list handling | Melanie | 2010-12-13 | 1 | -0/+2 |
| | | |||||
* | | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 3 | -123/+173 |
| | | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work. | ||||
* | | Change some lookups in he Land Management module to make group permissions | Melanie | 2010-12-13 | 1 | -4/+4 |
| | | | | | | | | | | work better. Add a generic group permissions hoot to the scene permissions system. | ||||
* | | Prevent objects that are worn from ground from vanishing from the scene | Melanie | 2010-12-12 | 1 | -9/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 9 | -125/+140 |
|\ \ | |/ | |||||
| * | Remove the restriction that you have to be logged in when loading/saving iars | Justin Clark-Casey (justincc) | 2010-12-11 | 2 | -72/+70 |
| | | | | | | | | This is pointless as we're supplying the password on the command line | ||||
| * | If we're saving an IAR with --profile information, then label this a version ↵ | Justin Clark-Casey (justincc) | 2010-12-11 | 1 | -5/+22 |
| | | | | | | | | 1.0 IAR since it isn't compatible with older OpenSim releases. | ||||
| * | Drop current OAR version back to 0.5 since these are currently now ↵ | Justin Clark-Casey (justincc) | 2010-12-11 | 3 | -35/+34 |
| | | | | | | | | | | | | compatible with older OpenSim versions again. Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this. | ||||
| * | 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 | ||||
| * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 1 | -1/+1 |
| | | | | | | | | command. mantis #5259 | ||||
| * | Fixed wrong comment | Diva Canto | 2010-12-08 | 1 | -1/+1 |
| | | |||||
| * | Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase ↵ | Diva Canto | 2010-12-08 | 1 | -1/+1 |
| | | | | | | | | yet... | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -42/+202 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-12-09 | 1 | -42/+202 |
| |\ | |||||
| | * | Added ability for GetTexture to serve multiple formats. The format may come ↵ | Diva Canto | 2010-12-08 | 1 | -42/+202 |
| | | | | | | | | | | | | as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>. | ||||
| * | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 2 | -0/+34 |
| |/ | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 2 | -0/+34 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
* | | Add the interface needed to revive calling cards | Melanie | 2010-12-07 | 1 | -0/+13 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-12-07 | 5 | -52/+29 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 5 | -52/+29 |
| |\ \ | | |/ | |||||
| | * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 2 | -6/+6 |
| | | | | | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 18 | -305/+737 |
| | |\ | |||||
| | | * | Simplify updating of agent inventory assets. Make newly created asset IDs | Melanie | 2010-12-04 | 1 | -19/+6 |
| | | | | | | | | | | | | | | | | random rather than using IDs known by the client ahead of time. | ||||
| | | * | Convert the agent asset transactions module to a new style module. | Melanie | 2010-12-04 | 3 | -168/+156 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor to remove the property "MyScene" and the pointless circular refs to the managing classes. Converted the module to a non-shared module. Reformatted source for 80 columns. Removed the special role the module had in the old loader. | ||||
| | * | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 2 | -56/+51 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 16 | -194/+651 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 6 | -52/+59 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * \ \ \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 5 | -50/+78 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-31 | 1 | -2/+2 |
| | |\ \ \ \ \ \ |