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
Teravus Ovares (Dan Olivares)
0a0b532270
* Fixes teleporting within megaregions on HG enabled regions. You can 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)
2009-09-25 15:31:19 -04:00
Justin Clark-Casey (justincc)
2995d87d75
minor: remove some mono compiler warnings
2009-09-25 19:29:40 +01:00
Justin Clark-Casey (justincc)
0bdf75637f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-25 19:19:01 +01:00
Diva Canto
eed8a61559
More small changes to FlotsamAssetCache as per mcortez' request.
2009-09-25 08:47:45 -07:00
Diva Canto
be7afa0b1f
Changed a [Groups] config as per mcortez' request.
2009-09-25 08:44:26 -07:00
Diva Canto
902279f0fd
Moved the property RegionLoginsEnabled from GridComms to the Scene -- not the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff.
2009-09-25 08:39:09 -07:00
Justin Clark-Casey (justincc)
9249c026f2
Don't preserve full user profile details within iars for now
...
This information was not being used in the load process
2009-09-25 16:22:43 +01:00
Diva Canto
295868033f
Better error handling on the client-side grid connector.
2009-09-25 07:47:58 -07:00
Diva Canto
b2772b3a2d
Added GridForm.html in Tests/Clients/Grid that shows how to interact with a grid server via regular Web forms. May be good for developing administrative tools.
2009-09-25 07:38:05 -07:00
Justin Clark-Casey (justincc)
613cb417c0
add control files containing version info to iars
2009-09-25 14:52:53 +01:00
Justin Clark-Casey (justincc)
730458be1f
minor: remove some mono compiler warnings
2009-09-25 14:31:29 +01:00
Diva Canto
52e477b41f
Better guards on RegisterRegion in GridService.
...
Added serverPort to the fields that get stored (I think this is the UDP port).
2009-09-25 06:02:41 -07:00
Diva Canto
eb0aa6a7f4
Make the grid client deregister the test regions at the end, so that they don't stay in the DB.
2009-09-24 18:48:38 -07:00
Diva Canto
b6824c495c
Deleted the meaningless console commands on the GridService. Will need to add meaningful ones.
2009-09-24 18:28:38 -07:00
Diva Canto
a792933cba
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-24 18:25:28 -07:00
Diva Canto
6a5d7650d0
All tests pass for MySQL/MySQLRegionData.
...
Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient.
2009-09-24 18:23:55 -07:00
Dan Lake
1b2828f5d8
Meshmerizer stores dictionary of unique Meshes keyed on construction parameters. CreateMesh() returns a Mesh from the dictionary or creates a new Mesh if it has not been created before. Meshes are never purged from the dictionary. The raw Mesh data is discarded once the memory is pinned for ODE use. All copies of the same prim/mesh use the same pinned memory. ONLY IMPLEMENTED AND TESTED WITH MESHMERIZER AND ODE
...
Signed-off-by: dahlia <dahliaTrimble@gmailDotCom>
2009-09-24 18:20:59 -07:00
dahlia
daffb69174
modify BulletDotNETPrim.cs in preparation for Mantis #4181
2009-09-24 18:16:29 -07:00
Diva Canto
1faaa0a43a
GridServerPostHandler finished. GridClient tests all work. More guards on getting parameters and replies over the wire.
2009-09-24 15:30:00 -07:00
Diva Canto
dd3d52ae1f
Added test GridClient, which allowed me to remove a few bugs out of the new code.
2009-09-24 13:33:58 -07:00
Justin Clark-Casey (justincc)
ad753d784c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-24 17:35:03 +01:00
Justin Clark-Casey (justincc)
784e78a9e8
minor: make rest (not comm) modules less noisy if they are disabled
2009-09-24 17:21:47 +01:00
Justin Clark-Casey (justincc)
e1abc3d4c4
re-enable registration of user service authentication method I accidentally disabled a few commits ago
...
load/save iar on a grid should now work, provided that the user service is this revision or newer
2009-09-24 15:22:47 +01:00