Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-04 | 8 | -6/+23 |
|\ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-06-04 | 4 | -3/+12 |
| |\ | |||||
| | * | Fixed a couple of buglets in Friendship offers / acceptance / decline when ↵ | Diva Canto | 2010-06-04 | 4 | -3/+12 |
| | | | | | | | | | | | | avies are in different sims. | ||||
| * | | get TestSaveIarV0_1() working again by setting up an ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 3 | -2/+10 |
| |/ | | | | | | | | | | | OpenSim.Data.Null.UserAuthenticationData plugin additional tweaks to get this working properly | ||||
| * | Applying patch from coyled to fix IAR support with the SimianGrid connectors | John Hurliman | 2010-06-01 | 1 | -1/+1 |
| | | |||||
| * | Get the user's DOB back from the server response properly. | Melanie Thielker | 2010-05-29 | 1 | -1/+1 |
| | | |||||
* | | Revert "Meta7 Communities : Authorization service added, skeleton, not yet ↵ | Melanie Thielker | 2010-05-29 | 1 | -59/+0 |
| | | | | | | | | | | | | functional" This reverts commit 31439293ccdb5df914dc13287a8f178529fccb6b. | ||||
* | | Meta7 Communities : Authorization service added, skeleton, not yet functional | Tom Grimshaw | 2010-05-29 | 1 | -0/+59 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-05-29 | 3 | -42/+52 |
|\ \ | | | | | | | | | | 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 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-28 | 2 | -41/+51 |
| |\ \ | | |/ | |||||
| | * | minor: move a method so that the #regions make more sense | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -36/+35 |
| | | | |||||
| | * | fission UserAccountService.HandleCreateUser() into two methods, one which ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -4/+14 |
| | | | | | | | | | | | | handles user command parsing and another which actually does the work | ||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -1/+2 |
| | | | |||||
* | | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵ | Tom Grimshaw | 2010-05-29 | 7 | -8/+33 |
|/ / | | | | | | | 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-21 | 3 | -122/+184 |
|\ \ | |/ | |||||
| * | Removed sessionID from GridUserservice again. Removed parcel crossing ↵ | Diva Canto | 2010-05-20 | 5 | -6/+12 |
| | | | | | | | | 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 | 5 | -125/+181 |
| |\ | |||||
| | * | * Added sessionID to IGridUserService.SetLastPosition(), as some connectors ↵ | unknown | 2010-05-20 | 5 | -125/+181 |
| | | | | | | | | | | | | | | | | | | 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 'master' into careminster-presence-refactor | Melanie | 2010-05-18 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Change an exception reporting to include the stack trace. "e.Message" just | Melanie | 2010-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | _won't_ do. Might look more elegant, but it's too little information. | ||||
* | | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 2 | -1/+21 |
| | | | | | | | | | | | | 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 | 3 | -3/+25 |
|\ \ \ | |/ / | |||||
| * | | 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 | 3 | -3/+8 |
| | | | |||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-05-16 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Add some debug output to GetAgent to try and track down our presence problems | Tom Grimshaw | 2010-05-13 | 1 | -0/+8 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 4 | -27/+44 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | * 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 | 2 | -5/+6 |
| | | | | | | | | | | | | 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. | ||||
| * | | Almost, but not quite. Commenting verification again, until I understand ↵ | Diva Canto | 2010-05-15 | 1 | -4/+4 |
| | | | | | | | | | | | | where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets. | ||||
| * | | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 4 | -18/+32 |
| |/ | |||||
| * | Made fields consistently protected. | Diva Canto | 2010-05-13 | 1 | -8/+8 |
| | | |||||
* | | 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-10 | 2 | -1/+7 |
|\ \ | |/ | |||||
| * | * Fixed spamming the assets table with map tiles. The tile image ID is now ↵ | Diva Canto | 2010-05-09 | 2 | -1/+7 |
| | | | | | | | | | | | | stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. * Fixed small bug with map search where the local sim regions weren't found. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-09 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Implement the "delete" path for assets. Adds a new option to allow remote ↵ | Melanie | 2010-05-09 | 1 | -0/+11 |
| | | | | | | | | asset deletion in robust handler. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-09 | 5 | -46/+5 |
|\ \ | |/ | |||||
| * | Add a field asset_flags and a corresponding enum to the asset database. This | Melanie | 2010-05-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS WITH LATER ONES. It may also eat your babies, yada, yada, yada. The usual cautions for migrations to the assets table apply. Coding: Can not guarantee nut free. | ||||
| * | * Added missing loggout notification to home grid upon agents logging out in ↵ | Diva Canto | 2010-05-08 | 1 | -0/+4 |
| | | | | | | | | | | | | foreign grids. * Added missing config in StandaloneHypergrid.ini | ||||
| * | More cleaning on presence. Friends online/offline works again. | Diva Canto | 2010-05-08 | 3 | -46/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-08 | 11 | -217/+465 |
|\ \ | |/ | |||||
| * | 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 | 11 | -211/+465 |
| | | | | | | | | | | | | 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 | 2 | -7/+8 |
| | | | | | | | | | | | | 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 | 2 | -0/+54 |
| | | | | | | | | | | | | 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 | 2 | -7/+8 |
| | | | | | | | | | | | | 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 | 2 | -0/+54 |
| | | | | | | | | | | | | 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. |