Commit Graph

11242 Commits (cc18ab12f87721dfb2db563c4aac68788126f391)

Author SHA1 Message Date
Jeff Ames e3217d4840 Convert DOS newlines to Unix newlines. 2009-09-29 08:50:40 +09:00
Jeff Ames f00126dc2d Add copyright header. Formatting cleanup. 2009-09-29 08:32:59 +09:00
Melanie ec464d9e87 More reordering 2009-09-28 23:19:30 +01:00
Melanie 01cfbac040 Reorder prebuild stuff to make panda eat bamboo in peace 2009-09-28 23:13:36 +01:00
Melanie 97c40bcba7 Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim 2009-09-28 23:04:32 +01:00
Diva Canto 7d46b627e2 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-28 15:51:07 -07:00
Diva Canto e6ee9785fb Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-28 15:48:26 -07:00
Melanie 0709149313 Merge branch 'grid-service-redux' 2009-09-28 23:03:47 +01:00
Melanie fe3760e4a2 Merge branch 'master' into 0.6.7-post-fixes
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
2009-09-28 22:57:38 +01:00
Melanie a1aa362866 Allow the notation config_name@port/dll_name:class_name as a handler spec
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
2009-09-28 22:48:57 +01:00
Diva Canto 276b0a0cbe Forgot a return statement. 2009-09-28 11:17:34 -07:00
Diva Canto 9bdb585a93 Added Protocol versions back, this time in a range model. 2009-09-28 10:56:05 -07:00
Melanie 7cd03abab5 Bump main version to 0.6.8-Dev 2009-09-28 18:41:21 +01:00
Melanie 63c3c7483f Bump version number in post-fixes 2009-09-28 18:38:48 +01:00
Diva Canto 3091e5db9d Fixed bug in user server related to region's serverURI. 2009-09-28 07:53:52 -07:00
Diva Canto 500cd3505a Added RegionSecret to GridRegion, and corresponding saving/retrieval from DB layer. This sounds fishy to me, but it's what's used to make external currency modules work, for now. 2009-09-28 07:20:38 -07:00
Diva Canto 69da82b39f Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which was causing an extra \n to be written into the buffer. 2009-09-28 06:44:57 -07:00
Diva Canto de48113962 Added GridService section to OpenSim.Server.ini.example 2009-09-28 06:08:35 -07:00
Diva Canto 0f05bbb4a2 Deleted some files that aren't being used anymore. 2009-09-28 05:54:37 -07:00
Melanie 0ed7371f3e Change DocToBytes to return no trailing whitespace. 2009-09-28 13:27:33 +01:00
Diva Canto 73a61a8a32 Fixed small bug in having to deal with RegionInfo's ServerURI, which wasn't being set. 2009-09-27 21:14:31 -07:00
Diva Canto 0766b6dc34 Fixed the connection from User server to GridServer. 2009-09-27 20:44:43 -07:00
Diva Canto e15a9b8484 Fixed an issue with the PresenceModule in "gridmode", introduced by my fixing the notifications of the messaging service in standalone. 2009-09-27 17:01:30 -07:00
Diva Canto b17be045e4 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-27 16:02:19 -07:00
Diva Canto 689eea3bad Guarding the methods under if (m_Enabled) 2009-09-27 15:06:44 -07:00
Melanie 42746e99bd Make the RegionData plugin store the RegionName 2009-09-27 23:02:40 +01:00
Diva Canto cde6b0d5ab Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-27 14:59:43 -07:00
Diva Canto 1980ab3152 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-27 14:39:41 -07:00
Diva Canto 8b2b8801e6 Fixed port in GridServer.ini. Added new configs for StandaloneHypergrid.ini 2009-09-27 14:32:03 -07:00
Diva Canto c99b363f81 Added missing IHyperlinkService. 2009-09-27 13:59:00 -07:00
Melanie 12640d0824 Prevent manually setting Data["locX"] and Data["locY"], since that would
overwrite the posX and posY members of the structure
2009-09-27 21:58:34 +01:00
Diva Canto 2432cc607e Neighbours cache working. 2009-09-27 13:43:57 -07:00
Melanie b5bf3f87d5 Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
	OpenSim/Data/MySQL/MySQLRegionData.cs
2009-09-27 21:25:10 +01:00
Melanie 8e091f5903 Add the Migration for the regions table 2009-09-27 21:17:23 +01:00
Diva Canto 5d09c53a1a Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules. 2009-09-27 10:14:10 -07:00
Diva Canto 68e40a87ca Poof! on LocalBackend. CommsManager.GridServices deleted. 2009-09-26 21:29:54 -07:00
Diva Canto 620fa2b772 Poof! on OGS1 GridServices. 2009-09-26 21:21:06 -07:00
Diva Canto 989382352d Poof! on Region.Communications.Hypergrid. Grid code deleted. 2009-09-26 21:14:41 -07:00
Diva Canto f4bf581b96 Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
Fixed small bugs with hyperlinked regions' map positions.
2009-09-26 21:00:51 -07:00
Diva Canto dcfd08b8dd Fixed a bug with link-region. 2009-09-26 11:01:18 -07:00
Diva Canto b5163889b9 Fixed the order of params to GetRegionRange. 2009-09-26 10:30:45 -07:00
Diva Canto 368ae02dc9 Corrected the port number to 8001 in the test client and grid ini. 2009-09-26 10:18:22 -07:00
Diva Canto ae222140ca Finished spec-ing the .inis for the new grid service modules. 2009-09-26 10:08:59 -07:00
Diva Canto 632bb71262 Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.
Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
2009-09-26 08:49:48 -07:00
Diva Canto d39e67d5b2 More redirects to HGGridConnector-as-HyperlinkService. 2009-09-26 08:06:14 -07:00
Diva Canto 7253a9453e Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-26 07:49:04 -07:00
Diva Canto 5757afe766 First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now. 2009-09-26 07:48:21 -07:00
Teravus Ovares (Dan Olivares) a7f3d01f8a Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-09-25 16:06:40 -04:00
Teravus Ovares (Dan Olivares) 2bb513329a * Does a full battery of tests to ensure that the object isn't an attachment 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.
2009-09-25 16:06:04 -04:00
dahlia fb2cabd6b3 corrections to viewerMode AddPos() 2009-09-25 13:01:48 -07:00