Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 11 | -62/+113 |
|\ | |||||
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 12 | -132/+131 |
| | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| * | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 4 | -34/+86 |
| | | |||||
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -1/+1 |
| |\ | |||||
| * | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -15/+15 |
| | | | |||||
| * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-18 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 3 | -15/+13 |
| | | | | |||||
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 5 | -13/+30 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 5 | -49/+15 |
| | | | | | | |||||
| * | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 9 | -66/+51 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 12 | -119/+64 |
|\ \ \ \ \ \ | |||||
| * | | | | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | | | | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 3 | -15/+13 |
| | | | | | | | |||||
| * | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 5 | -49/+15 |
| | | | | | | | |||||
| * | | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 9 | -66/+51 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Deleted verbose debug messages that are bringing sims to an halt. Increased ↵ | Diva Canto | 2010-10-19 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | | | | | | | | | | | the user cache expiration period to 33 hours. | ||||
| * | | | | Change substring matching to prefix matching in region search. This affects | Melanie | 2010-10-18 | 1 | -1/+1 |
| | |_|/ | |/| | | | | | | | | | | both map and login, as they use the same method. | ||||
* | | | | Change substring matching to prefix matching in region search. This affects | Melanie | 2010-10-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | both map and login, as they use the same method. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 4 | -10/+27 |
|\ \ \ \ | |/ / / | |||||
| * | | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 4 | -10/+27 |
| | | | | | | | | | | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
| * | | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 1 | -3/+3 |
| | |/ | |/| | |||||
* | | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-02 | 1 | -5/+33 |
|\ \ | |/ | |||||
| * | couple fixes to enable profiles in simian connector | Master ScienceSim | 2010-09-30 | 1 | -5/+33 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 6 | -24/+40 |
|\ \ | |/ | |||||
| * | Actually log users out (call LogoutAgent) in the ↵ | John Hurliman | 2010-09-29 | 1 | -0/+6 |
| | | | | | | | | SimianPresenceServiceConnector when LoggedOut() is called | ||||
| * | Part two of the previous commit, making IGridUserService.LoggedOut() more ↵ | John Hurliman | 2010-09-29 | 6 | -10/+16 |
| | | | | | | | | flexible without changing current behavior | ||||
| * | Made IGridUserService.SetLastPosition() more flexible to allow different ↵ | John Hurliman | 2010-09-29 | 5 | -14/+18 |
| | | | | | | | | 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 | ||||
| * | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 1 | -2/+2 |
| | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
| * | Fix the above | Melanie | 2010-09-14 | 1 | -4/+3 |
| | | |||||
* | | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 1 | -2/+2 |
| | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
* | | Suppress the strange "Result not Dictionary" messages that happen when | root | 2010-09-16 | 1 | -0/+3 |
| | | | | | | | | a region queries for a nonexistent presence. | ||||
* | | Revert last commit | meta7 | 2010-09-15 | 1 | -0/+1 |
| | | |||||
* | | Don't throw an exception if the authorizationservice is missing a serviceuri ↵ | meta7 | 2010-09-15 | 1 | -1/+0 |
| | | | | | | | | config entry. Not every authorization service will need a URI. | ||||
* | | Fix the above | Melanie | 2010-09-14 | 1 | -4/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 2 | -0/+16 |
|\ \ | |/ | |||||
| * | Allow to place the connection strings and providers for estate and region | Melanie | 2010-09-14 | 2 | -0/+16 |
| | | | | | | | | | | in their oqn sections, for those of us who don't want a catch-all DatabaseService section. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 17 | -98/+426 |
|\ \ | |/ | | | | | | | 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. | ||||
| * | Merged | John Hurliman | 2010-09-12 | 5 | -15/+15 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 5 | -15/+15 |
| | | | |||||
| * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 2 | -27/+154 |
| |/ | | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings | ||||
| * | Added a stub for ↵ | John Hurliman | 2010-09-12 | 1 | -0/+125 |
| | | | | | | | | OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector | ||||
| * | Made it impossible to create a user with names containing spaces and ↵ | randomhuman | 2010-09-10 | 1 | -2/+4 |
| | | | | | | | | prevented passwords from being echoed after enter is pressed. | ||||
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 1 | -1/+4 |
| | | |||||
| * | * Run SimianGrid session updates asynchronously instead of from the main ↵ | John Hurliman | 2010-09-09 | 6 | -66/+5 |
| | | | | | | | | | | | | heartbeat thread * Minor dead code cleanup | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-08 | 3 | -8/+25 |
| |\ | |||||
| | * | Made the HG asset and inventory brokers use the Helo service in order to ↵ | Diva Canto | 2010-09-08 | 1 | -8/+15 |
| | | | | | | | | | | | | instantiate the right network connectors. Tested on Robust only. |