Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 2 | -2/+24 |
|\ \ | |/ | |||||
| * | Fixes mantis #4691 for real. This time I tested it, and it works. | Diva Canto | 2010-05-16 | 2 | -1/+18 |
| | | |||||
| * | Fixes mantis #4691 | Diva Canto | 2010-05-16 | 2 | -2/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 1 | -14/+22 |
|\ \ | |/ | |||||
| * | * Fixed configs in StandaloneHypergrid.ini, it still had the SQLite ↵ | Diva Canto | 2010-05-16 | 1 | -2/+4 |
| | | | | | | | | | | | | connection strings. * Added a comment in LLLoginService.cs, for future reference | ||||
| * | This combination is working. It all points to not being able to use ↵ | Diva Canto | 2010-05-15 | 1 | -0/+1 |
| | | | | | | | | 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing. | ||||
| * | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 1 | -6/+11 |
| | | |||||
| * | Made fields consistently protected. | Diva Canto | 2010-05-13 | 1 | -8/+8 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-08 | 2 | -32/+35 |
|\ \ | |/ | |||||
| * | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 2 | -32/+35 |
| | | | | | | | | | | | | home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway. BTW, the Meshing files want to be committed too -- EOFs. | ||||
| * | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-05 | 1 | -6/+7 |
| | | | | | | | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data. | ||||
| * | Add a XMLRPC method to remotely set the login level for the LLLoginService. | Melanie Thielker | 2010-05-05 | 1 | -0/+53 |
| | | | | | | | | | | | | This requires a special XMLRPC call, which has to supply the credentials of a god user (User level >= 200). Disabled by default. Also Adds a configuration option to set the initial permitted login level. | ||||
* | | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-06 | 1 | -6/+7 |
| | | | | | | | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data. | ||||
* | | Add a XMLRPC method to remotely set the login level for the LLLoginService. | Melanie Thielker | 2010-05-05 | 1 | -0/+53 |
| | | | | | | | | | | | | This requires a special XMLRPC call, which has to supply the credentials of a god user (User level >= 200). Disabled by default. Also Adds a configuration option to set the initial permitted login level. | ||||
* | | Treat a UserLevel of -1 as an unverified account and refer them to their | Melanie | 2010-04-30 | 2 | -0/+11 |
|/ | | | | activation email. |