Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -15/+2 |
|\ | |||||
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -15/+2 |
| | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| * | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 1 | -1/+8 |
| | | |||||
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -1/+2 |
| |\ | |||||
| * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -1/+7 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -2/+15 |
|\ \ \ | |||||
| * | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 1 | -1/+8 |
| | | | | |||||
| * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -1/+7 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -1/+2 |
| |/ | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 1 | -3/+23 |
|\ \ | |/ | |||||
| * | Part two of the previous commit, making IGridUserService.LoggedOut() more ↵ | John Hurliman | 2010-09-29 | 1 | -1/+11 |
| | | | | | | | | flexible without changing current behavior | ||||
| * | Made IGridUserService.SetLastPosition() more flexible to allow different ↵ | John Hurliman | 2010-09-29 | 1 | -2/+12 |
| | | | | | | | | possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 1 | -2/+5 |
|\ \ | |/ | |||||
| * | Fix bug in llGiveInventory() where items were disappearing on relog | Justin Clark-Casey (justincc) | 2010-08-23 | 1 | -2/+5 |
| | | | | | | | | | | This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set This may have been broken since commit bd49985a on 2010-05-02 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -2/+4 |
| | | | | | | | | untested. Committing to move to my other computer. | ||||
* | | Get maturity level from access number. This addresses mantis #269 | meta7 | 2010-08-20 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-07 | 1 | -0/+1 |
| |\ | |||||
| | * | Allow creation of link regions if there is an existing region within a 4096 ↵ | Marck | 2010-08-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service. | ||||
| * | | Correct display of landmark about info. Also correct region maturity rating | Melanie Thielker | 2010-08-07 | 1 | -1/+1 |
| |/ | | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity. | ||||
* | | Correct display of landmark about info. Also correct region maturity rating | Melanie Thielker | 2010-08-07 | 1 | -1/+1 |
| | | | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-16 | 1 | -1/+3 |
|\ \ | |/ | |||||
| * | Fixes creation date issue on user accounts. | Diva Canto | 2010-06-15 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-07 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | * Bug fix in TP home: typo in unpacking of GridUserInfo. | Diva Canto | 2010-06-05 | 1 | -1/+1 |
| | | | | | | | | * Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions. | ||||
| * | Get the user's DOB back from the server response properly. | Melanie Thielker | 2010-05-29 | 1 | -1/+1 |
| | | |||||
| * | Removed sessionID from GridUserservice again. Removed parcel crossing ↵ | Diva Canto | 2010-05-20 | 1 | -1/+1 |
| | | | | | | | | detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface. | ||||
| * | Merging slimupdates2 | unknown | 2010-05-20 | 1 | -1/+1 |
| |\ | |||||
| | * | * Added sessionID to IGridUserService.SetLastPosition(), as some connectors ↵ | unknown | 2010-05-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | will want to track position against sessionID instead of userID * Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing | ||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-05-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Get the user's DOB back from the server response properly. | Melanie Thielker | 2010-05-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵ | Tom Grimshaw | 2010-05-29 | 1 | -2/+6 |
|/ / / | | | | | | | | | | 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. | ||||
* | | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 1 | -0/+8 |
| | | | | | | | | | | | | teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-10 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fixed a typo in the Friends packaging (Pricipal -> Principal) that was ↵ | Diva Canto | 2010-05-10 | 1 | -1/+1 |
| | | | | | | | | making offline friendship offers fail in grids. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-09 | 1 | -28/+0 |
|\ \ | |/ | |||||
| * | More cleaning on presence. Friends online/offline works again. | Diva Canto | 2010-05-08 | 1 | -28/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-08 | 2 | -29/+43 |
|\ \ | |/ | |||||
| * | Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete ↵ | Diva Canto | 2010-05-07 | 1 | -6/+0 |
| | | | | | | | | fields. | ||||
| * | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 2 | -23/+43 |
| | | | | | | | | | | | | 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 | -1/+1 |
| | | | | | | | | | | | | 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/+1 |
| | | | | | | | | | | | | 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. | ||||
| * | Make the IUserAccountData properly unpack the god mode data, so grid gods | Melanie Thielker | 2010-05-02 | 1 | -3/+3 |
| | | | | | | | | work again | ||||
* | | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | 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/+1 |
| | | | | | | | | | | | | 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. | ||||
* | | Make the IUserAccountData properly unpack the god mode data, so grid gods | Melanie Thielker | 2010-05-03 | 1 | -3/+3 |
| | | | | | | | | work again |