Commit Graph

15075 Commits (28022a91986a1357bd17f75b7130cf36f8bc25d1)

Author SHA1 Message Date
opensim mirror account f9f386f73b Merge branch 'master' of /var/git/opensim/ 2010-11-22 07:20:08 -08:00
Melanie d2aebbe066 Fox case on a method 2010-11-22 14:27:45 +00:00
Melanie 506192e466 Make an invalud key string in llTextBox and llDialog non fatal to avoid
breakinf sloppily made no-mod scripted items.
2010-11-22 15:16:28 +01:00
Melanie 4e0a289a8d Change FS Voice module to a shared module to avoid gratuitious server handler
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
2010-11-22 14:13:27 +00:00
Melanie 54d1d6d917 Fox case on a method 2010-11-22 14:32:51 +01:00
Melanie 87f30709a2 Merge branch 'master' into careminster-presence-refactor 2010-11-22 14:14:45 +00:00
opensim mirror account d272a5bd25 Merge branch 'master' of /var/git/opensim/ 2010-11-22 02:20:10 -08:00
Marck 8a2c365e5b Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART and CHANGED_REGION work.
Fixes Mantix #5214.
2010-11-22 10:39:46 +01:00
Jonathan Freedman b7f5e82843 Merge branch 'master-core' into mantis5110 2010-11-21 20:01:48 -08:00
Jonathan Freedman 562147475c Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
opensim mirror account f01e1094a3 Merge branch 'master' of /var/git/opensim/ 2010-11-21 17:50:03 -08:00
opensim mirror account c913f92f0f Merge branch 'master' of /var/git/opensim/ 2010-11-21 17:30:05 -08:00
Diva Canto 0fec29c849 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-21 17:19:45 -08:00
Diva Canto c617d658dd Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
Melanie 22ff06ba17 Merge branch 'master' into careminster-presence-refactor 2010-11-22 01:09:26 +00:00
opensim mirror account a1549a1d85 Merge branch 'master' of /var/git/opensim/ 2010-11-21 16:50:03 -08:00
Melanie 8466ada8e0 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-11-22 00:46:37 +00:00
Melanie ddf08276f1 Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not. 2010-11-22 00:46:23 +00:00
opensim mirror account e2e828d1d5 Merge branch 'master' of /var/git/opensim/ 2010-11-21 16:30:05 -08:00
Melanie 7e9a3019ac Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not. 2010-11-22 00:55:11 +01:00
opensim mirror account a145a294cf Merge branch 'master' of /var/git/opensim/ 2010-11-21 15:50:03 -08:00
Melanie 8d7b181b58 Merge branch 'master' into careminster-presence-refactor 2010-11-21 23:47:28 +00:00
Melanie c85e6bc36d Add the remote connector for freeswitch config retrieval 2010-11-21 23:42:52 +00:00
Melanie 5f8a0f3d1f Add the remote connector for freeswitch config retrieval 2010-11-21 23:41:56 +00:00
opensim mirror account dd67175edf Merge branch 'master' of /var/git/opensim/ 2010-11-21 15:40:03 -08:00
opensim mirror account 3d113e9f1d Merge branch 'master' of /var/git/opensim/ 2010-11-21 15:30:05 -08:00
Melanie 2105842513 Finish the standalone mode freeswitch work and add config examples 2010-11-21 23:24:39 +00:00
opensim mirror account b4025eb48e Merge branch 'master' of /var/git/opensim/ 2010-11-21 15:20:02 -08:00
Melanie a7174cecdd Remove username and password from the publicly accessible FS config 2010-11-21 22:45:04 +00:00
opensim mirror account 68e8e35640 Merge branch 'master' of /var/git/opensim/ 2010-11-21 14:40:08 -08:00
Melanie 6fa24f4671 Convert the Freeswitch module to new style 2010-11-21 22:40:03 +00:00
opensim mirror account d0c764bf2e Merge branch 'master' of /var/git/opensim/ 2010-11-21 14:30:10 -08:00
Melanie e6c52f38c5 Strip the dialplan and directory methods from the region module 2010-11-21 22:25:50 +00:00
Melanie 2b0ef9ad1d Implement a method to allow regions to query the gridwide Freeswitch
configuration from ROBUST
2010-11-21 22:17:25 +00:00
Melanie b43a01179e Correct an error in Robust.ini.example 2010-11-21 21:35:31 +00:00
Diva Canto af8c8197ab Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still used?!? 2010-11-21 13:29:20 -08:00
Melanie ed5f91c638 Move Dialplan and Directory from the region module to the ROBUST server 2010-11-21 21:29:17 +00:00
Melanie c0ccfeebe7 Start implementing Freeswitch in ROBUST 2010-11-21 21:29:11 +00:00
Diva Canto 51343caeb5 Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of SOP.CreatorID. Untested, but should work. 2010-11-21 13:27:03 -08:00
Melanie 83a427a8f9 Move Dialplan and Directory from the region module to the ROBUST server 2010-11-21 21:18:03 +00:00
Diva Canto 6a9ae9e7cb Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
Melanie 1cf8eb8a90 Start implementing Freeswitch in ROBUST 2010-11-21 20:59:01 +00:00
opensim mirror account d04cbd8f85 Merge branch 'master' of /var/git/opensim/ 2010-11-19 19:10:12 -08:00
Marck f1151f20dc Fix global region coordinates that are delivered by llRequestSimulatorData.
Also did some source code clean-up by replacing literals with constants.
2010-11-20 03:03:11 +00:00
Justin Clark-Casey (justincc) a88bcbb118 Knock V0_2 decals off archive tests since they're misleading 2010-11-20 03:01:47 +00:00
Justin Clark-Casey (justincc) d7bca3d8e8 Fix unit tests and save problems
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
2010-11-20 02:59:21 +00:00
opensim mirror account c4dd724cba Merge branch 'master' of /var/git/opensim/ 2010-11-19 18:50:05 -08:00
Justin Clark-Casey (justincc) 1087d6042b correct build break. for some reason, xbuild didn't rebuild test dlls 2010-11-20 02:43:38 +00:00
opensim mirror account 4ec0933c99 Merge branch 'master' of /var/git/opensim/ 2010-11-19 18:40:08 -08:00
Justin Clark-Casey (justincc) f49e32bfaa Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-20 02:34:27 +00:00