aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-214-7/+9
|\
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-08-213-33/+83
| |\
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-202-32/+80
| | |\
| | * | Fixed a missing field in SendBulkInventoryFolderUpdate.Diva Canto2009-08-201-1/+3
| | | |
| * | | Fix the user and password defaults int he remote console setupMelanie2009-08-213-6/+6
| |/ /
* | | * Fleshes more of NPCModule out.Adam Frisby2009-08-214-13/+90
| |/ |/| | | | | | | | | | | | | | | * Implements some OSSL commands: key osNpcCreate(string user, string name, vector position, key cloneFrom); void osNpcMoveTo(key npc, vector position); void osNpcSay(key npc, string message); void osNpcRemove(key npc); * Untested. Requires ThreatLevel.High.
* | * Implements a bunch of stuff in NPCModuleAdam Frisby2009-08-212-32/+80
|/
* Remove the AssetInventory server from core. It has fallen behind bothMelanie2009-08-2023-5707/+0
| | | | | | upstream and the reference implementation to the point where it is no longer usable. It has no known users, and sinnce it doesn't work anymore, it is safe to assume that no one has used it in a long time.
* Remove a load-order dependency in inventory transfer that was bitingMelanie2009-08-201-7/+6
| | | | Windows users
* Add some output (at DEBUG level) to the message transfer module to aidMelanie2009-08-201-0/+4
| | | | in tracking down an initialization failure.
* * Only update TextureEntry in AvatarAppearance if the incoming XML-RPC has a ↵John Hurliman2009-08-201-1/+8
| | | | valid TextureEntry. About half the time update_avatar_appearance calls are made, the TextureEntry is empty
* One more place fixed for setting the inventory folder owner. Thanks jhurliman.Diva Canto2009-08-201-1/+1
|
* Commented T021_TestCrossToNewRegion because (1) it can fail on panda, and ↵Diva Canto2009-08-191-1/+8
| | | | (2) it is not a meaningful representation of region crossing.
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1924-164/+115
|\
| * Fixing a spot I missed in assets. Switching Grid to the new naming schema ↵Kunnis2009-08-1911-69/+42
| | | | | | | | with Store/Get
| * * Switching IAssetData to follow the new naming schema, removing the ↵Kunnis2009-08-1913-95/+73
| | | | | | | | separate insert and update methods.
| * Fixes GetRootFolder for normal standalone, which was being incorrectly ↵Diva Canto2009-08-192-5/+5
| | | | | | | | | | | | | | redirected to the wrong object. Probably fixes most grief in http://opensimulator.org/mantis/view.php?id=4035 http://opensimulator.org/mantis/view.php?id=4027
* | Fixes GetItem and GetFolder for SQLite. Turns out some methods were no-op in ↵Diva Canto2009-08-194-10/+10
|/ | | | | | | SQlite. Fixes most grief in http://opensimulator.org/mantis/view.php?id=4035 http://opensimulator.org/mantis/view.php?id=4027
* Makes the inventory connectors fully compatible with the old ↵Diva Canto2009-08-191-29/+35
| | | | | | Grid.InventoryServer. WARNING: interacting with the old server is _much_ slower than interacting with the new one. Grids with the old server will not see any improvements on crossings and TPs, because inventory needs to be fetched from it in its entirety.
* Added MoveItems, which is most useful upon viewer-delete inventory ↵Diva Canto2009-08-1916-38/+162
| | | | operation. Moving a batch of items is a 1-time operation. Made it async anyway, so that the viewer doesn't wait in case the DB layer is dumb (which is the case currently).
* Async purge so that the client thread doesn't wait.Diva Canto2009-08-192-7/+27
|
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-199-26/+230
|\
| * Graft the REST console onto the message server as well. What a dirty hack!Melanie2009-08-192-21/+74
| | | | | | | | Works the same as the others.
| * Graft the REST console onto the grid server. Same procedure as withMelanie2009-08-194-4/+52
| | | | | | | | the user server.
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-08-193-17/+56
| |\
| | * osGetLinkPrimitiveParams fixJeff Lee2009-08-181-1/+25
| | |
| * | Add rest console support to the user server. Will ask new questions atMelanie2009-08-193-1/+80
| | | | | | | | | | | | | | | | | | startup. To use, run it normally once, answering the questions, then run again with -console=rest. Also now supports -console=basic for a console that reads stdin
* | | A better purge of trash folder.Diva Canto2009-08-1920-53/+106
| | |
* | | GetFolderItems implemented. It's not being called, but it might.Diva Canto2009-08-185-3/+48
| | |
* | | jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024Diva Canto2009-08-189-30/+52
| |/ |/|
* | Added new OpenSim.ini setting: "client_throttle_max_bps" which overrides ↵dahlia2009-08-182-16/+31
|/ | | | user's viewer network throttle settings
* Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020)Diva Canto2009-08-181-14/+12
|
* Commented 2 tests in ScenePresenceTests, one because things were being done ↵Diva Canto2009-08-171-6/+13
| | | | in the wrong order, and the other because it NEEDS the inventory service set up. Test-writers, please please please do the scene setup properly EVERYWHERE. It's close to impossible to rely on tests that don't setup resource service references!
* Added one conditional missing on login, for creating inventory if it doesn't ↵Diva Canto2009-08-171-1/+13
| | | | exist already. This hopefully fixes the master avatar problems on standalone.
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-174-100/+31
|\
| * Did I say that i don't like git? Remove some stuff that shouldn't haveMelanie2009-08-174-100/+31
| | | | | | | | gone in.
* | Commented out one IAR test, because it's failing and needs attention from ↵Diva Canto2009-08-171-5/+7
|/ | | | justincc or arthursv. I think the mock inventory service needs a little bit more beef.
* Added some padding to the remote inventory connector so that it tries to ↵Diva Canto2009-08-171-4/+70
| | | | operate with the old Grid.InventoryServer.exe. Untested, but it should work -- slow.
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-178-26/+86
|\
| * no-op to poke pandaJustin Clark-Casey (justincc)2009-08-171-4/+4
| |
| * Apply http://opensimulator.org/mantis/view.php?id=4016Justin Clark-Casey (justincc)2009-08-171-0/+13
| | | | | | | | | | Make previously hidden cookies available to code Thanks jhurliman
| * Apply http://opensimulator.org/mantis/view.php?id=3538Justin Clark-Casey (justincc)2009-08-172-4/+18
| | | | | | | | | | | | Add ability to silence IRC relay of region joins and quits from certain users This is useful for admins who wish to remain hidden, or service bots. Thanks RemedyTomm
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-181-0/+2
| |\
| | * * More Test tweaking to get down to the root cause of the test wierdnessTeravus Ovares (Dan Olivares)2009-08-171-0/+2
| | |
| * | Added additional configuration options for MRM Security. See ↵Adam Frisby2009-08-181-8/+22
| |/ | | | | | | OpenSim.ini.example under the [MRM] section.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-1835-362/+1531
| |\
| * | * Implementing a bunch of Unimplemented MRM stubs.Adam Frisby2009-08-182-10/+27
| | |
* | | Bumping the interface number down again, because this *may* not be a ↵Diva Canto2009-08-171-1/+1
| | | | | | | | | | | | breaking change with older sims.
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1739-369/+1656
|\ \ \ | | |/ | |/|
| * | Add System.Xml reference to the console projectMelanie2009-08-175-32/+101
| | |