82abaadd55
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-20 08:36:54 +01:00
ae554a48d0
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:36:23 +01:00
b4e7c62fbc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-19 19:55:03 -07:00
a39ea07158
Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
2010-08-19 19:54:40 -07:00
1955b79759
Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer.
2010-08-19 18:55:30 -07:00
f639a9e5ae
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 20:24:46 +01:00
22fdd7b1f1
Short-circuit the grid server lookup for RequestSimulatorData if the region
...
info is requested for is the local region
2010-08-19 20:24:34 +01:00
31365e3ec4
These files want to be committed. This time I'm doing it separately from other commits.
2010-08-19 09:17:08 -07:00
2b172bef72
Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."
...
Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way.
This reverts commit e47608fc62
2010-08-19 09:14:20 -07:00
ee7c799699
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 11:46:07 +01:00
f58a809536
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 11:45:56 +01:00
d547007e73
Improve some logging in LandConnector
...
This also eliminate the last 'OGS1' logging message (in this case, an erroneous one)
2010-08-19 01:57:07 +01:00
a72c7812f4
remove ancient and unused OpenSim.GridLaunch GUI code.
...
Current policy is that OpenSim core is not the place for gui tools
2010-08-19 01:11:10 +01:00
5e3d53bef2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-19 00:54:48 +01:00
85f448642b
minor: Correct string format in "Can't find linkset root prim" message
2010-08-19 00:54:09 +01:00
e47608fc62
One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943 .
...
(Files .xml and .txt also want to be committed)
2010-08-18 16:22:50 -07:00
8c12f22140
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-18 23:15:25 +01:00
11db33d520
Add textures no longer shipped with newer viewers to OpenSim's standard asset library
...
These are appropriately licensed and include plant, tree and miscellaneous textures (face target crosshairs, etc).
Many thanks to Nebadon for sourcing and packaging these.
2010-08-18 23:15:05 +01:00
6ddf124c8a
Prevent a bad cast in llCreateLink().
2010-08-18 20:00:19 +01:00
a8c0b131f9
* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() to fix the build
2010-08-17 13:50:04 -07:00
e1f2c32284
* Updated to OpenMetaverse.StructuredData.dll that includes implicit typecasts going in the other direction
2010-08-17 12:26:20 -07:00
53190e332d
Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecasts
2010-08-17 12:04:37 -07:00
d7824b86d9
Fixes mantis #4954 for the xml-rpc calls of the UserAgentServiceConnector. Basically, let's not let the xml-rpc library do the DNS conversion...
2010-08-16 14:36:20 -07:00
69ad04cdf6
Attempt at sending TeleportProgress, but it doesn't seem to be doing anything at all. Left it commented, just as a reminder for where those messages could be sent.
2010-08-16 12:03:13 -07:00
a8b80ef800
Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files affected.
2010-08-16 11:39:46 -07:00
77de28965a
Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
2010-08-16 11:33:59 -07:00
f219e320bc
Increased the timeout on AgentUpdate to 30 sec and improved error message to try to catch some weirdnesses going on in HG TPs (and maybe non-HG TPs too).
2010-08-16 08:51:56 -07:00
a5044e08fb
Better comment (related to previous commit)
2010-08-15 18:13:09 -07:00
5d29c0ec9d
Addresses mantis #4929 . Agent was being logged off the grid too soon -- things may still fail.
2010-08-15 18:10:54 -07:00
30d0bf4207
Fix SQLite database plugin for UserAccountData queries with a single word.
2010-08-15 17:27:06 -07:00
d5c24241b7
Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG)
2010-08-15 17:25:27 -07:00
96e4099564
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-13 17:40:18 -07:00
d806741e9d
* Cleaned up the magic UUID definitions in AvatarWearable.cs
2010-08-13 17:39:45 -07:00
e1cff5f8c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-14 00:58:12 +01:00
46d0690b31
* Fixed a casing typo for Simian profile data
...
* Minor logging tweak in Simian asset connector
2010-08-13 16:56:01 -07:00
1463691cb6
In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from libomv rather than little endian then swapping
...
This avoids a problem with failing to swap on big-endian machines.
This addresses http://opensimulator.org/mantis/view.php?id=4849
Thanks to Valy- for pointing this out and submitting a suggestion patch
2010-08-14 00:48:12 +01:00
fcc83f2305
Unit test for ConfigurationLoader.
...
Adds a new test assembly for OpenSim.
2010-08-13 23:59:33 +01:00
ae43a07f3b
Configuration files can read include files from relative paths.
2010-08-13 23:59:30 +01:00
8eeb3f2fd2
Updated the create_region command in the RemoteAdmin plugin to properly support estates without seeking further input on the console.
2010-08-13 23:29:01 +01:00
8acb401a14
minor: remove mono compiler warnings
2010-08-13 23:28:28 +01:00
c64bef146b
minor: remove mono compiler warnings
2010-08-13 23:18:05 +01:00
ab6dc47818
refactor: move binary statistics logging from scene into separate region module
2010-08-13 23:15:11 +01:00
e89f0b3f71
refactor: move Scene.PerformObjectBuy into BuySellModule
2010-08-13 22:29:42 +01:00
9d84dfb687
minor: remove mono compiler warning
2010-08-13 21:44:44 +01:00
b30635a454
Establish new Objects/BuySellModule
...
Move Scene.ObjectSaleInfo() to this
2010-08-13 21:39:43 +01:00
feba3164af
minor: remove mono compiler warning
2010-08-13 21:19:32 +01:00
5d20f04e08
refactor: move Scene.TerrainUnAcked() handling into TerrainModule
2010-08-13 21:18:26 +01:00
b51534852f
minor: remove mono compiler warning
2010-08-13 21:07:45 +01:00
fd23f270c6
refactor: remove Scene.SetRootAgentScene() in favour of existing event with same name
2010-08-13 21:01:10 +01:00
5f5c65e4ba
refactor: move more map tile generation code from scene to IWorldMapModule
2010-08-13 20:34:46 +01:00
Melanie