Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 5 | -13/+137 | |
| | |\ \ | | | | | | | | | | | | | | | | dev-appearance | |||||
| | * | | | * 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 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -23/+29 | |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs | |||||
| * | | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵ | Marck | 2010-10-28 | 1 | -20/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linked regions. * Added check for already occupied region coordinates. * Optimized Check4096. | |||||
| * | | | | 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. | |||||
* | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 5 | -24/+142 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -11/+5 | |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly. | |||||
| * | | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 5 | -13/+137 | |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 2 | -8/+6 | |
| |/ |/| | ||||||
* | | * 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 | |
|\ \ | |/ | ||||||
| * | 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. | |||||
* | | * 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 | |
|\ \ | |/ | ||||||
| * | 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. | |||||
* | | * 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 | |
|\ \ | |/ | ||||||
| * | 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 | |
| | | ||||||
* | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Initial port of the Warp3D map tile renderer | Melanie | 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 | |
|/ | ||||||
* | couple fixes to enable profiles in simian connector | Master ScienceSim | 2010-09-30 | 1 | -5/+33 | |
| | ||||||
* | 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 | |
| | ||||||
* | 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. | |||||
* | 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. | |||||
| * | Added constructor that takes an URL to asset and inventory simian connectors. | Diva Canto | 2010-09-08 | 2 | -0/+10 | |
| | | ||||||
* | | * Changed 11 calls for session info to the more optimized API method | John Hurliman | 2010-09-08 | 1 | -2/+2 | |
|/ | ||||||
* | First version of the Hypergrid HELO service that will enable different ↵ | Diva Canto | 2010-09-08 | 1 | -0/+75 | |
| | | | | backends to interoperate. | |||||
* | Rolling back the recent libomv update but keeping the ExpiringCache cleanups ↵ | John Hurliman | 2010-09-07 | 1 | -3/+3 | |
| | | | | (as much as is possible). There was a report of non-finite avatar positions after the update | |||||
* | * Cache null account responses in the SimianUserAccountServiceConnector to ↵ | John Hurliman | 2010-09-07 | 1 | -3/+13 | |
| | | | | | | avoid repeated requests for missing avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-07 | 7 | -119/+140 | |
|\ | ||||||
| * | Fix Simian regression | Melanie | 2010-09-07 | 7 | -119/+140 | |
| | | ||||||
* | | * Added sanity checks to the SimianAssetServiceConnector so it will throw a ↵ | John Hurliman | 2010-09-07 | 1 | -0/+30 | |
|/ | | | | sensible error message when it is misconfigured instead of a mysterious "Uri is empty" error |