| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -2/+1 |
| |\ | |||||
| | * | 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-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) | ||||
| | * | 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 | ||||
| * | | 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 | 4 | -78/+93 |
| |\ \ | |/ | |||||
| | * | 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. | ||||
| | * | 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 |
| |\ \ | |/ | |||||
| | * | 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>. | ||||
| * | | Add the interface needed to revive calling cards | Melanie | 2010-12-07 | 1 | -0/+13 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -3/+3 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 5 | -101/+145 |
| | |\ | |||||
| | * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 1 | -55/+50 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 3 | -77/+94 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 2 | -36/+39 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -5/+10 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 2 | -32/+5 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -29/+18 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -43/+62 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 5 | -101/+286 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 1 | -13/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ↵ | Mic Bowman | 2010-12-03 | 1 | -36/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging. | ||||
| * | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 4 | -43/+78 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found | ||||
| | * | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 1 | -24/+6 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Refactor appearance and avatar data sending code. Paritioning the routines ↵ | Mic Bowman | 2010-11-27 | 1 | -24/+6 |
| | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. Cleaned up the avatar update calls in the groups code. Cleaned up some commented and debugging code, and a few formating fixes. | ||||
| | * | | | | | | | | | | Fix unit test. | Diva Canto | 2010-11-29 | 3 | -9/+16 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Preservation of creator information now also working in IARs. Cleaned up ↵ | Diva Canto | 2010-11-29 | 4 | -35/+63 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. | ||||
| * | | | | | | | | | | Various bug fixes for appearance handling | Mic Bowman | 2010-11-30 | 1 | -34/+59 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Change inworld restart to use blue boxes rather than notices to match SL | Melanie | 2010-11-29 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Implement god summons | Melanie | 2010-11-28 | 1 | -7/+21 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Convert the scope id in the im session id to a URL variable. Fixes offline | Melanie | 2010-11-26 | 1 | -10/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group notice attachments not working | ||||
| * | | | | | | | | | | Prevent an overlength button label from producing a debug dump and aborting | Melanie | 2010-11-24 | 1 | -24/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the script. | ||||
| * | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-23 | 1 | -55/+50 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Only perform the take object permissions check if an object is being ↵ | Justin Clark-Casey (justincc) | 2010-11-23 | 1 | -55/+50 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | attached directly from the scene, not from existing inventory | ||||
| * | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | Global creator information working on MySQL DB and on load/save OARs. ↵ | Diva Canto | 2010-11-21 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule. | ||||
| * | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-18 | 1 | -53/+74 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | Fixed appearance send for avatars with only default textures. This should ↵ | Master ScienceSim | 2010-11-18 | 1 | -53/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -22/+12 |
| | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | ||||
| * | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -28/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | ||||
| * | | | | | | | | When detaching a scripted item, always consider it modified. Script states | Melanie | 2010-11-16 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will have changed and for real usability, we need to save it. It bloats assets, but that can't be avoided. | ||||
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 2 | -33/+32 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Formatting cleanup. | Jeff Ames | 2010-11-08 | 2 | -33/+32 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-08 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |