| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 2 | -2/+2 |
| |\ | |||||
| | * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 2 | -2/+2 |
| | | | | | | | | | Didn't touch the appearance related stuff. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -0/+5 |
| |\ \ | |/ | |||||
| | * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 1 | -0/+5 |
| | | | | | | | | | command. mantis #5259 | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 2 | -32/+4 |
| |\ \ | |/ | |||||
| | * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -2/+2 |
| | | | | | | | | | 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 | 1 | -0/+16 |
| | |\ | |||||
| | * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -10/+30 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -5/+5 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 1 | -4/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 1 | -0/+16 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | Also prevent god takes from ending up in Lost and Found | ||||
| | * | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 1 | -0/+16 |
| | | |_|/ | |/| | | | | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. | ||||
| * | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password. | ||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-17 | 1 | -10/+30 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Do not include hyperlinks in a random region search during a login. | Marck | 2010-11-13 | 1 | -10/+30 |
| | | | | | | | | | | | | | | | | | Before a random region is chosen, available fallback regions are used for the login. | ||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -5/+5 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 1 | -5/+5 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 1 | -5/+5 |
| | | |\ \ \ | | | | |/ | | | |/| | | | | | | dev-appearance | ||||
| | | | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations. | ||||
| * | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -1/+28 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+28 |
| | | |_|/ | |/| | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -6/+14 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -28/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -28/+1 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 1 | -28/+1 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -6/+14 |
| |\ \ \ | |/ / | |||||
| | * | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -6/+14 |
| | |/ | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Added XFF header processing. Untested, for lack of proxy. | Diva Canto | 2010-09-03 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 1 | -5/+1 |
| |\ \ | |/ | |||||
| | * | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -5/+1 |
| | | | | | | | | | untested. Committing to move to my other computer. | ||||
| * | | Whitespace conflict | Melanie Thielker | 2010-08-09 | 1 | -4/+0 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-09 | 1 | -2/+6 |
| |\ \ | |/ | |||||
| | * | Make fallbacks work, the destination was never actually updated with the ↵ | meta7 | 2010-08-09 | 1 | -4/+5 |
| | | | | | | | | | | | | | fallback details. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-08 | 2 | -5/+1 |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-09 | 2 | -5/+1 |
| | |\ \ | | |/ | |||||
| | | * | Remove "Could not authorize your session into the region" message in favor | Melanie | 2010-08-09 | 2 | -5/+1 |
| | | | | | | | | | | | | | of sending back the actual error message provided by the sim. | ||||
| | | * | Add search URL to Login Service | Melanie | 2010-08-07 | 2 | -2/+20 |
| | | | | |||||
| * | | | Make fallbacks work, the destination was never actually updated with the ↵ | meta7 | 2010-08-08 | 1 | -6/+7 |
| |/ / | | | | | | | fallback details. | ||||
| * | | Add search URL to Login Service | Melanie | 2010-08-07 | 2 | -2/+20 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-31 | 1 | -4/+2 |
| |\ \ | |/ | |||||
| | * | Changed the way HG client verification is done: now transforming local and ↵ | Diva Canto | 2010-07-30 | 1 | -4/+2 |
| | | | | | | | | | LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-04 | 2 | -3/+22 |
| |\ \ | |/ | |||||
| | * | Fixes mantis #4835 | Diva Canto | 2010-07-03 | 1 | -1/+1 |
| | | | |||||
| | * | Add MapTileURL to robust to supply the url needed by snowglobe | Melanie | 2010-07-02 | 2 | -2/+21 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-04 | 1 | -0/+2 |
| |\ \ | |/ | |||||
| | * | Fixed a couple of buglets in Friendship offers / acceptance / decline when ↵ | Diva Canto | 2010-06-04 | 1 | -0/+2 |
| | | | | | | | | | avies are in different sims. | ||||
| * | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵ | Tom Grimshaw | 2010-05-29 | 1 | -0/+1 |
| | | | | | | | | | be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad. | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |