Justin Clark-Casey (justincc)
e9c05cf385
change 0.6.7 candidate branch down to RC1
2009-09-29 21:47:11 +01:00
Justin Clark-Casey (justincc)
74a05ac32b
small test change
2009-09-29 21:25:13 +01:00
dr scofield (aka dirk husemann)
09cb8a594b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
2009-09-29 17:00:02 +02:00
Diva Canto
37a8b2b8b7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 07:56:29 -07:00
Alan M Webb
2a7bedb5e9
This fix addresses the problem where phantom objects do not
...
always behave like they are phantom, and llVolumeDetect
seems to operate in a random fashion.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-29 16:55:03 +02:00
Diva Canto
bc892c1d4c
A little hack to see if this fixes the problems with ~20% of SOG's becoming phantom after an import to megaregions.
2009-09-29 07:54:56 -07:00
Alan M Webb
a43706862c
Given the perverse way that strided works, if
...
there is only one element in the range, it must
also coincide with the specified stride. The
existing code assumes that the stride starts at
start ( which is the expected and most useful
behavior).
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-29 15:40:41 +02:00
Jeff Ames
77f5e41631
Remove empty CheckSumServer.cs file.
2009-09-29 21:21:53 +09:00
Melanie
691f1e8aa0
Fix loading modules with alternate configurations and ports into ROBUST.
...
Make all current modules support the configuration name option
2009-09-29 09:56:17 +01:00
Diva Canto
13c6202da9
Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.
2009-09-29 09:50:18 +01:00
Melanie
1096103d66
Fix loading modules with alternate configurations and ports into ROBUST.
...
Make all current modules support the configuration name option
2009-09-29 09:44:12 +01:00
Diva Canto
6653a30487
Fixed bug in HG that was causing secondlife:// refs to bomb the client.
...
Also fiddled a bit more with the initial CAP in the user server.
2009-09-28 20:58:21 -07:00
Diva Canto
95981776dd
Fixed bug in Check4096 (HG).
2009-09-28 20:11:10 -07:00
Diva Canto
f4e8ac3556
Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.
2009-09-28 18:53:07 -07:00
Diva Canto
a60ed0562c
I think I have fixed something that was broken in the scene setup (tests) and that needs to be reflected in all other services setups. But the teleport test still doesn't work. Commenting it for now.
2009-09-28 17:42:35 -07:00
Diva Canto
51d9f7ebd4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-28 17:35:26 -07:00
Diva Canto
4eca59ec13
Improved the Local grid connector to fetch data from the DB when it doesn't 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.
2009-09-28 17:33:34 -07:00
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