Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-04 | 4 | -29/+36 |
|\ | |||||
| * | Assorted bug fixes in hypergrid linking. | Diva Canto | 2010-05-03 | 4 | -29/+36 |
| | | |||||
| * | Make the IUserAccountData properly unpack the god mode data, so grid gods | Melanie Thielker | 2010-05-02 | 2 | -4/+4 |
| | | | | | | | | work again | ||||
| * | Allow retrieval if admin users in scope mode | Melanie Thielker | 2010-04-30 | 1 | -0/+18 |
| | | |||||
* | | Make the IUserAccountData properly unpack the god mode data, so grid gods | Melanie Thielker | 2010-05-03 | 2 | -4/+4 |
| | | | | | | | | work again | ||||
* | | Allow retrieval if admin users in scope mode | Melanie Thielker | 2010-04-30 | 1 | -0/+18 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-30 | 2 | -66/+55 |
|\ \ | |/ | |||||
| * | * XInventory fairly tested, including for HG. Almost ready to switch. | Diva Canto | 2010-04-30 | 2 | -66/+55 |
| | | | | | | | | * Removed a few buglets and added better exception handling. | ||||
* | | Treat a UserLevel of -1 as an unverified account and refer them to their | Melanie | 2010-04-30 | 2 | -0/+11 |
| | | | | | | | | activation email. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-29 | 4 | -56/+87 |
|\ \ | |/ | |||||
| * | Started redoing HGInventoryBroker for XInventory and with multi-protocol in ↵ | Diva Canto | 2010-04-29 | 1 | -3/+3 |
| | | | | | | | | mind. Unfinished. | ||||
| * | Merge branch 'minor-stuff' | Melanie | 2010-04-28 | 1 | -1/+1 |
| |\ | |||||
| | * | Removed unused var from InventoryService.cs (-1 warning) | AlexRa | 2010-04-28 | 1 | -1/+1 |
| | | | |||||
| * | | Putting it back to protected; Melanie doesn't like it to be public. | Diva Canto | 2010-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | Changed GetToken from protected to public. This is not exposed at the interface. | Diva Canto | 2010-04-27 | 1 | -1/+1 |
| | | | |||||
| * | | * Thanks cmickeyb, for a patch that sanity checks if the response from ↵ | John Hurliman | 2010-04-27 | 1 | -1/+4 |
| | | | | | | | | | | | | m_Database.GetAsset(assetID) is null in AssetService.cs | ||||
| * | | XInventory connector/handler showing signs of life. Tested, but needs more ↵ | Diva Canto | 2010-04-27 | 2 | -54/+82 |
| |/ | | | | | | | testing. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 3 | -15/+61 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-27 | 1 | -0/+29 |
| |\ | |||||
| | * | RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵ | Diva Canto | 2010-04-26 | 1 | -0/+29 |
| | | | | | | | | | | | | default configs yet. | ||||
| * | | Allow a client to pass a scope id to log into in the login XML / LLSD | Melanie | 2010-04-27 | 2 | -15/+32 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 2 | -7/+12 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-04-22 | 1 | -3/+3 |
| |\ | |||||
| | * | Sanitized parsing of floats (x, y, z location) for Culture. | Diva Canto | 2010-04-22 | 1 | -3/+3 |
| | | | |||||
| * | | * Better error logging for failed SimianGrid web service calls | John Hurliman | 2010-04-22 | 1 | -4/+9 |
| |/ | |||||
* | | Remove some usings that stopped compilation | Melanie Thielker | 2010-04-24 | 1 | -15/+1 |
| | | |||||
* | | Plumb a data path to initialize an attachment from an alternate source | Melanie Thielker | 2010-04-24 | 1 | -0/+31 |
|/ | |||||
* | Applying a patch from lkalif to fix a small bug in the previous patch | John Hurliman | 2010-04-14 | 1 | -1/+1 |
| | |||||
* | Applying patch from lkalif to add support for inventory links to the ↵ | John Hurliman | 2010-04-13 | 1 | -0/+12 |
| | | | | SimianGrid connectors | ||||
* | * Adds IAssetService.GetCached() to allow asset fetching from the local ↵ | John Hurliman | 2010-04-08 | 5 | -0/+42 |
| | | | | | | | cache only * Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer * Sanity check for null reference in LLClientView.RefreshGroupMembership() | ||||
* | * Fixing incorrect documentation for the continuation passing style ↵ | John Hurliman | 2010-04-07 | 2 | -2/+3 |
| | | | | | | IAssetService.Get() method * Changing the SimianGrid asset service connector to match the corrected documentation | ||||
* | * In the async asset fetch method, cache check before firing any async code. ↵ | John Hurliman | 2010-04-05 | 1 | -47/+62 |
| | | | | This should alleviate some "thread storm" issues when regions are starting up that hit Mono especially hard | ||||
* | * Guard against null in last commit | Diva Canto | 2010-04-03 | 1 | -1/+2 |
| | |||||
* | Last commit was too fast... must override. | Diva Canto | 2010-04-03 | 1 | -1/+1 |
| | |||||
* | * Made UserAccountService handle UserLevel, UserFlags and UserTitle ↵ | Diva Canto | 2010-04-03 | 1 | -0/+7 |
| | | | | | | appropriately. * Removed Store service from the UserAccount handler. | ||||
* | * Better logging for Authenticate() failures | John Hurliman | 2010-04-02 | 2 | -3/+11 |
| | | | | * Changed a warning message to debug when fetching user sessions | ||||
* | Change the SimianGrid connector log messages to start with "[SIMIAN " to ↵ | John Hurliman | 2010-03-26 | 9 | -112/+112 |
| | | | | avoid configuration confusion | ||||
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-03-26 | 1 | -3/+40 |
|\ | |||||
| * | * Fixed a bug with null value handling in WebUtil.BuildQueryString() | John Hurliman | 2010-03-26 | 1 | -3/+40 |
| | | | | | | | | | | * Changed the null check back in estate manager setup but fixed the case for an existing account being found * Implemented SetPassword() in the SimianGrid auth connector | ||||
* | | Minor improvement on debug message. | Diva Canto | 2010-03-26 | 1 | -31/+30 |
| | | |||||
* | | Select Random Region if Home or Last cant be found | unknown | 2010-03-26 | 1 | -14/+34 |
|/ | |||||
* | First stage of the new interactive region creation. This will allow creation | Melanie | 2010-03-23 | 1 | -2/+2 |
| | | | | | | | of a region and joining it to an existing estate or creating a new estate, as well as creating an estate owner if in standalone, and assigning estate owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as I can't develop or test for either SQLite or MSSQL. | ||||
* | * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values ↵ | John Hurliman | 2010-03-20 | 1 | -1/+1 |
| | | | | | | and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll * Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate() | ||||
* | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 1 | -2/+2 |
| | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. | ||||
* | * Fixing the SimianGrid friend connector enabled detection since the friends ↵ | John Hurliman | 2010-03-16 | 1 | -1/+9 |
| | | | | module uses a different pattern in the .ini file | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-15 | 2 | -0/+6 |
|\ | |||||
| * | Get the local inner simulation service object to the handler so that there ↵ | Diva Canto | 2010-03-15 | 2 | -0/+6 |
| | | | | | | | | is no possibility of cascading requests when failures happen. | ||||
* | | * Fixed a bug in Simian.IsSimianEnabled (since the default module strings ↵ | John Hurliman | 2010-03-15 | 1 | -1/+1 |
|/ | | | | follow the form OpenSim.Services.Connectors.dll:SimianGridServiceConnector instead of SimianGridServiceConnector) | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-15 | 2 | -6/+5 |
|\ | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-03-12 | 2 | -6/+5 |
| | |