| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -0/+2 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | ||||
| | * | Propagate our teleport flags on logins | BlueWall | 2012-02-18 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-11-24 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -0/+3 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Multiple lines in welcome message use '\n' in the welcome message to | nebadon | 2011-11-05 | 1 | -0/+3 |
| | | | | | | | | | start a new line. | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -4/+23 |
| |\ \ | |/ | |||||
| | * | minor: comment out friends number logging from login for now | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -1/+1 |
| | | | |||||
| | * | Added optional Login Service parameter "Currency" to be able to change the ↵ | Snoopy Pfeffer | 2011-08-14 | 2 | -2/+21 |
| | | | | | | | | | currency name shown in the viewer. | ||||
| | * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -1/+1 |
| | | | | | | | | | This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 1 | -0/+8 |
| |\ \ | |/ | |||||
| | * | People are bound to forget the '/' at the end of MapTileURL, so let's ↵ | Diva Canto | 2011-06-12 | 1 | -0/+8 |
| | | | | | | | | | correct that from the inside. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -14/+48 |
| |\ \ | |/ | |||||
| | * | Add alternate region handling for url based logins as found in login to ↵ | BlueWall | 2011-06-01 | 1 | -3/+15 |
| | | | | | | | | | "home" or "last" | ||||
| | * | Added necessary code to drop inventory on hg friends using the profile ↵ | Diva Canto | 2011-05-24 | 1 | -10/+20 |
| | | | | | | | | | window, but can't test because this mechanism doesn't seem to work without a profile service. | ||||
| | * | More on HG Friends. Added Delete(string, string) across the board. Added ↵ | Diva Canto | 2011-05-22 | 1 | -1/+1 |
| | | | | | | | | | security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back. | ||||
| | * | HG Friends working to some extent: friendships offered and accepted ↵ | Diva Canto | 2011-05-19 | 1 | -1/+13 |
| | | | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 2 | -2/+0 |
| |\ \ | |/ | |||||
| | * | Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll | Diva Canto | 2011-04-30 | 2 | -2/+0 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -3/+37 |
| |\ \ | |/ | |||||
| | * | Thank you Snoopy for a patch that adds some filtering to client versions ↵ | Diva Canto | 2011-04-27 | 1 | -3/+37 |
| | | | | | | | | | allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples. | ||||
| | * | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
| | | | |||||
| | * | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
| | | | | | | | | | | | was entered by hand to determine whether or not to honor the landing point | ||||
| * | | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
| | | | |||||
| * | | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
| | | | | | | | | | | | was entered by hand to determine whether or not to honor the landing point | ||||
| * | | 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 |
| | | |/ | |/| | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |