Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Continuing refactor. Refactor DeRezObject to deal with multiple objects | Melanie Thielker | 2010-06-01 | 2 | -2/+29 |
| | |||||
* | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-05-29 | 7 | -230/+220 |
|\ | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-28 | 7 | -230/+220 |
| |\ | |||||
| | * | get TestSaveIarV0_1() uncommented but not running as a test yet since I ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -106/+99 |
| | | | | | | | | | | | | didn't get the authentication server to work and my brain is about to fizzle out my ears | ||||
| | * | restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -51/+37 |
| | | | | | | | | | | | | work with the new UserAccountService/InventoryService | ||||
| | * | fission UserAccountService.HandleCreateUser() into two methods, one which ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -52/+50 |
| | | | | | | | | | | | | handles user command parsing and another which actually does the work | ||||
| | * | Add ability to load IARs directly from URIs | Justin Clark-Casey (justincc) | 2010-05-28 | 2 | -6/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | So, something like load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar Will load my IAR directly from the web. | ||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -1/+1 |
| | | | |||||
| | * | refactor: move GetStream and URI methods from ArchiveReadRequest -> ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 3 | -64/+65 |
| | | | | | | | | | | | | ArchiveHelpers | ||||
| | * | Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more" | Melanie | 2010-05-27 | 1 | -13/+1 |
| | | | | | | | | | | | | | | | | | | Some other stuff snuck in. This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a. | ||||
| | * | Comment noisy "CONNECTION DEBUGGING" messages, because they push more | Melanie Thielker | 2010-05-27 | 1 | -1/+13 |
| | | | | | | | | | | | | important stuff off screen too fast | ||||
* | | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵ | Tom Grimshaw | 2010-05-29 | 1 | -11/+20 |
|/ / | | | | | | | 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-24 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | minor: expand upon comments about not scheduling two full updates for ↵ | Justin Clark-Casey (justincc) | 2010-05-24 | 1 | -2/+3 |
| | | | | | | | | attachments | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 5 | -42/+106 |
|\ \ | |/ | |||||
| * | Fix a problem where SceneGraph.AddSceneObject() would return false on ↵ | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -1/+0 |
| | | | | | | | | | | | | successfully adding an object rather than true, in defiance of its method documentation This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added. | ||||
| * | make oar object filename/pathname creation a helper method | Justin Clark-Casey (justincc) | 2010-05-21 | 4 | -38/+75 |
| | | | | | | | | | | reused in both tests and oar code reduction in checking is outweighed by greater test clarity | ||||
| * | add prim item and test asset save in save oar unit test | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -3/+31 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 1 | -9/+7 |
|\ \ | |/ | |||||
| * | Only send dialogs and notices to root agents, not child agents | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -9/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 3 | -8/+26 |
|\ \ | |/ | |||||
| * | Removed sessionID from GridUserservice again. Removed parcel crossing ↵ | Diva Canto | 2010-05-20 | 3 | -13/+5 |
| | | | | | | | | 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 | -6/+32 |
| |\ | |||||
| | * | * Added sessionID to IGridUserService.SetLastPosition(), as some connectors ↵ | unknown | 2010-05-20 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | | | 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' of ssh://opensimulator.org/var/git/opensim into ↵ | unknown | 2010-05-15 | 2 | -2/+7 |
| | |\ | | | | | | | | | | | | | slimupdates2 | ||||
| | * | | Implements three new OSSL functions for parcel management: osParcelJoin ↵ | OpenSim Master | 2010-05-13 | 2 | -0/+26 |
| | | | | | | | | | | | | | | | | joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed. | ||||
* | | | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 2 | -0/+32 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | | | Prevent an "index out of range" error on login | Melanie Thielker | 2010-05-18 | 1 | -2/+5 |
| | | | | |||||
* | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-05-16 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | | Don't convert UUID -> ToString for every friend (Minor optimisation based on ↵ | Tom Grimshaw | 2010-05-12 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | profiler feedback) | ||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 3 | -3/+8 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Address symptom of Mantis 4588 (though not the cause) by moving the avatar ↵ | Justin Clark-Casey (justincc) | 2010-05-15 | 1 | -2/+3 |
| | | | | | | | | | | | | dereference inside the exception catch | ||||
| * | | Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671 | Justin Clark-Casey | 2010-05-14 | 1 | -0/+4 |
| |/ | | | | | | | | | Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object Thanks crystalsgalicia! | ||||
* | | Correct an odd merge anomaly | Tom Grimshaw | 2010-05-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-05-10 | 7 | -116/+116 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-10 | 3 | -18/+19 |
| |\ \ | | |/ | |||||
| | * | * Fixed spamming the assets table with map tiles. The tile image ID is now ↵ | Diva Canto | 2010-05-09 | 3 | -18/+19 |
| | | | | | | | | | | | | | | | | | | 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 | 4 | -98/+97 |
| |\ \ | | |/ | |||||
| | * | * Added missing loggout notification to home grid upon agents logging out in ↵ | Diva Canto | 2010-05-08 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | foreign grids. * Added missing config in StandaloneHypergrid.ini | ||||
| | * | More cleaning on presence. Friends online/offline works again. | Diva Canto | 2010-05-08 | 3 | -98/+89 |
| | | | |||||
* | | | Greatly improve login time for users with large friends lists by requesting ↵ | Tom Grimshaw | 2010-05-10 | 1 | -6/+39 |
|/ / | | | | | | | all unknown UUID's in one go rather than individually | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-08 | 10 | -53/+357 |
|\ \ | |/ | |||||
| * | Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete ↵ | Diva Canto | 2010-05-07 | 1 | -3/+1 |
| | | | | | | | | fields. | ||||
| * | These files are part of the GridUserService write-up. | Diva Canto | 2010-05-07 | 2 | -0/+269 |
| | | |||||
| * | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 8 | -50/+87 |
| | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-07 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Also remove sale and search flags on god owner change. | Melanie | 2010-05-07 | 1 | -0/+1 |
| | | |||||
| * | Remove land that is being abandoned from search. This is now consistent with | Melanie | 2010-05-07 | 1 | -0/+1 |
| | | | | | | | | sale and reclaim. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-06 | 3 | -1/+14 |
|\ \ | |/ |