Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-28 | 19 | -374/+418 |
|\ | |||||
| * | Convert DOS newlines to Unix newlines. | Jeff Ames | 2009-09-29 | 2 | -265/+265 |
| | | |||||
| * | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-09-29 | 16 | -69/+113 |
| | | |||||
| * | More reordering | Melanie | 2009-09-28 | 1 | -40/+40 |
| | | |||||
* | | Improved the Local grid connector to fetch data from the DB when it doesn't ↵ | Diva Canto | 2009-09-28 | 4 | -5/+45 |
|/ | | | | | | find it in the cache. Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes. | ||||
* | Reorder prebuild stuff to make panda eat bamboo in peace | Melanie | 2009-09-28 | 1 | -43/+43 |
| | |||||
* | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-09-28 | 0 | -0/+0 |
|\ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-28 | 2 | -6/+64 |
| |\ | |||||
| * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-28 | 2 | -2/+2 |
| |\ \ | |||||
* | \ \ | Merge branch 'grid-service-redux' | Melanie | 2009-09-28 | 79 | -4193/+1406 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Forgot a return statement. | Diva Canto | 2009-09-28 | 1 | -1/+1 |
| | | | |||||
| * | | Added Protocol versions back, this time in a range model. | Diva Canto | 2009-09-28 | 3 | -1/+76 |
| | | | |||||
| * | | Fixed bug in user server related to region's serverURI. | Diva Canto | 2009-09-28 | 1 | -1/+1 |
| | | | |||||
| * | | Added RegionSecret to GridRegion, and corresponding saving/retrieval from DB ↵ | Diva Canto | 2009-09-28 | 1 | -5/+9 |
| | | | | | | | | | | | | layer. This sounds fishy to me, but it's what's used to make external currency modules work, for now. | ||||
| * | | Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, ↵ | Diva Canto | 2009-09-28 | 1 | -2/+2 |
| | | | | | | | | | | | | which was causing an extra \n to be written into the buffer. | ||||
| * | | Added GridService section to OpenSim.Server.ini.example | Diva Canto | 2009-09-28 | 1 | -1/+10 |
| | | | |||||
| * | | Deleted some files that aren't being used anymore. | Diva Canto | 2009-09-28 | 3 | -131/+0 |
| | | | |||||
| * | | Fixed small bug in having to deal with RegionInfo's ServerURI, which wasn't ↵ | Diva Canto | 2009-09-27 | 1 | -0/+1 |
| | | | | | | | | | | | | being set. | ||||
| * | | Fixed the connection from User server to GridServer. | Diva Canto | 2009-09-27 | 2 | -32/+33 |
| | | | |||||
| * | | Fixed an issue with the PresenceModule in "gridmode", introduced by my ↵ | Diva Canto | 2009-09-27 | 1 | -3/+0 |
| | | | | | | | | | | | | fixing the notifications of the messaging service in standalone. | ||||
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-27 | 1 | -2/+3 |
| |\ \ | |||||
| * | | | Guarding the methods under if (m_Enabled) | Diva Canto | 2009-09-27 | 1 | -3/+7 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-27 | 1 | -0/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-27 | 3 | -8/+28 |
| |\ \ \ \ | |||||
| * | | | | | Fixed port in GridServer.ini. Added new configs for StandaloneHypergrid.ini | Diva Canto | 2009-09-27 | 2 | -2/+4 |
| | | | | | | |||||
| * | | | | | Added missing IHyperlinkService. | Diva Canto | 2009-09-27 | 1 | -0/+49 |
| | | | | | | |||||
| * | | | | | Neighbours cache working. | Diva Canto | 2009-09-27 | 6 | -11/+126 |
| | | | | | | |||||
| * | | | | | Unpacking the mess with OtherRegionUp, so we can have a real cache of the ↵ | Diva Canto | 2009-09-27 | 16 | -127/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | neighbours in the grid service modules. | ||||
| * | | | | | Poof! on LocalBackend. CommsManager.GridServices deleted. | Diva Canto | 2009-09-26 | 4 | -419/+0 |
| | | | | | | |||||
| * | | | | | Poof! on OGS1 GridServices. | Diva Canto | 2009-09-26 | 2 | -939/+0 |
| | | | | | | |||||
| * | | | | | Poof! on Region.Communications.Hypergrid. Grid code deleted. | Diva Canto | 2009-09-26 | 6 | -1465/+0 |
| | | | | | | |||||
| * | | | | | Moved all HG1 operations to HGGridConnector.cs and ↵ | Diva Canto | 2009-09-26 | 14 | -100/+537 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo. Fixed small bugs with hyperlinked regions' map positions. | ||||
| * | | | | | Fixed a bug with link-region. | Diva Canto | 2009-09-26 | 5 | -37/+25 |
| | | | | | | |||||
| * | | | | | Fixed the order of params to GetRegionRange. | Diva Canto | 2009-09-26 | 1 | -6/+10 |
| | | | | | | |||||
| * | | | | | Corrected the port number to 8001 in the test client and grid ini. | Diva Canto | 2009-09-26 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Finished spec-ing the .inis for the new grid service modules. | Diva Canto | 2009-09-26 | 6 | -5/+34 |
| | | | | | | |||||
| * | | | | | Fixed MapBlocks bug, wrong order of arguments. First version that seems ↵ | Diva Canto | 2009-09-26 | 5 | -12/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completely functional. Also fixed the notification of the message server in standalone -- that server doesn't usually exist. | ||||
| * | | | | | More redirects to HGGridConnector-as-HyperlinkService. | Diva Canto | 2009-09-26 | 2 | -6/+20 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-26 | 15 | -34/+112 |
| |\ \ \ \ \ | |||||
| * | | | | | | First pass at the heart surgery for grid services. Compiles and runs ↵ | Diva Canto | 2009-09-26 | 27 | -983/+444 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | minimally. A few bugs to catch now. | ||||
* | | | | | | | Allow the notation config_name@port/dll_name:class_name as a handler spec | Melanie | 2009-09-28 | 2 | -6/+64 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in OpenSim.Server.ini This allows things like "8003/AssetServirce.dll local@8004/InventoryService.dll" The config name is not yet supported by any modules | ||||
* | | | | | | Bump main version to 0.6.8-Dev | Melanie | 2009-09-28 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Change DocToBytes to return no trailing whitespace. | Melanie | 2009-09-28 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Make the RegionData plugin store the RegionName | Melanie | 2009-09-27 | 1 | -2/+3 |
| |_|_|/ |/| | | | |||||
* | | | | Prevent manually setting Data["locX"] and Data["locY"], since that would | Melanie | 2009-09-27 | 1 | -0/+4 |
| |_|/ |/| | | | | | | | | overwrite the posX and posY members of the structure | ||||
* | | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-09-27 | 65 | -805/+3442 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLRegionData.cs | ||||
| * | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -1/+40 |
| |\ \ | |||||
| | * | | corrections to viewerMode AddPos() | dahlia | 2009-09-25 | 2 | -1/+40 |
| | | | | |||||
| * | | | * Does a full battery of tests to ensure that the object isn't an attachment ↵ | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -4/+9 |
| |/ / | | | | | | | | | | | | | | | | | | | before border crossing * Fixes 'Inconsistent Attachment State' when teleporting into another region besides the SW most region slot on a MegaRegion. * Fixes a host of other unintended attachment border cross edge cases that lead to Inconsistent attachment state. | ||||
| * | | * Fixes teleporting within megaregions on HG enabled regions. You can ↵ | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -3/+9 |
| | | | | | | | | | | | | teleport around now. (but it still doesn't fix the inconsistent attachment state when teleporting into region slots that are not the south west region on megaregions) |