aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-2011-164/+213
|\
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-191-1/+6
| |\
| * | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵Diva Canto2010-08-194-119/+48
| | | | | | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
| * | Partial rewrite of client IP verification. Not completely finished yet, and ↵Diva Canto2010-08-198-47/+167
| | | | | | | | | | | | untested. Committing to move to my other computer.
* | | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie2010-08-203-17/+60
| |/ |/| | | | | to make it more configurable.
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-191-40/+28
|\ \ | |/
| * These files want to be committed. This time I'm doing it separately from ↵Diva Canto2010-08-192-327/+327
| | | | | | | | other commits.
| * Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."Diva Canto2010-08-193-367/+355
| | | | | | | | | | | | 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 e47608fc62647a28be91dd9caf6e446826fdb54c.
* | Short-circuit the grid server lookup for RequestSimulatorData if the regionMelanie Thielker2010-08-191-1/+6
|/ | | | info is requested for is the local region
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-1936-4334/+11
|\
| * Improve some logging in LandConnectorJustin Clark-Casey (justincc)2010-08-191-6/+10
| | | | | | | | This also eliminate the last 'OGS1' logging message (in this case, an erroneous one)
| * remove ancient and unused OpenSim.GridLaunch GUI code.Justin Clark-Casey (justincc)2010-08-1934-4327/+0
| | | | | | | | Current policy is that OpenSim core is not the place for gui tools
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-193-355/+367
| |\
| * | minor: Correct string format in "Can't find linkset root prim" messageJustin Clark-Casey (justincc)2010-08-191-1/+1
| | |
* | | Skip conversion if fields that are null in the database. This mayMelanie Thielker2010-08-191-0/+4
| |/ |/| | | | | uncover errors elsewhere.
* | One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943.Diva Canto2010-08-183-355/+367
|/ | | | (Files .xml and .txt also want to be committed)
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-1817-30/+83
|\
| * Prevent a bad cast in llCreateLink().Melanie Thielker2010-08-181-1/+5
| |
| * * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() ↵John Hurliman2010-08-173-3/+3
| | | | | | | | to fix the build
| * * Updated to OpenMetaverse.StructuredData.dll that includes implicit ↵John Hurliman2010-08-171-0/+0
| | | | | | | | typecasts going in the other direction
| * Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecastsJohn Hurliman2010-08-171-0/+0
| |
| * Fixes mantis #4954 for the xml-rpc calls of the UserAgentServiceConnector. ↵Diva Canto2010-08-161-2/+13
| | | | | | | | Basically, let's not let the xml-rpc library do the DNS conversion...
| * Attempt at sending TeleportProgress, but it doesn't seem to be doing ↵Diva Canto2010-08-161-0/+3
| | | | | | | | anything at all. Left it commented, just as a reminder for where those messages could be sent.
| * Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files ↵Diva Canto2010-08-168-0/+32
| | | | | | | | affected.
| * Work on TeleportStart: renamed method from TeleportLocationStart to ↵Diva Canto2010-08-1613-24/+27
| | | | | | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
* | Add textures no longer shipped with newer viewers to OpenSim's standard ↵Justin Clark-Casey (justincc)2010-08-1845-0/+338
|/ | | | | | | 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.
* Increased the timeout on AgentUpdate to 30 sec and improved error message to ↵Diva Canto2010-08-161-2/+2
| | | | try to catch some weirdnesses going on in HG TPs (and maybe non-HG TPs too).
* Better comment (related to previous commit)Diva Canto2010-08-151-1/+1
|
* Addresses mantis #4929. Agent was being logged off the grid too soon -- ↵Diva Canto2010-08-152-6/+23
| | | | things may still fail.
* Fix SQLite database plugin for UserAccountData queries with a single word.Marck2010-08-151-1/+1
|
* Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG)Diva Canto2010-08-151-1/+10
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-08-131-6/+4
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-142-2/+2
| |\
| * | In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from ↵Justin Clark-Casey (justincc)2010-08-141-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | * Cleaned up the magic UUID definitions in AvatarWearable.csJohn Hurliman2010-08-131-12/+27
| |/ |/|
* | * Fixed a casing typo for Simian profile dataJohn Hurliman2010-08-132-2/+2
|/ | | | * Minor logging tweak in Simian asset connector
* Unit test for ConfigurationLoader.Marck2010-08-133-0/+176
| | | | Adds a new test assembly for OpenSim.
* Configuration files can read include files from relative paths.Marck2010-08-132-2/+22
|
* Updated the create_region command in the RemoteAdmin plugin to properly ↵randomhuman2010-08-136-68/+134
| | | | support estates without seeking further input on the console.
* minor: remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-1310-63/+62
|
* minor: remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-131-3/+2
|
* refactor: move binary statistics logging from scene into separate region moduleJustin Clark-Casey (justincc)2010-08-133-110/+181
|
* refactor: move Scene.PerformObjectBuy into BuySellModuleJustin Clark-Casey (justincc)2010-08-136-173/+222
|
* minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-131-3/+3
|
* Establish new Objects/BuySellModuleJustin Clark-Casey (justincc)2010-08-132-22/+99
| | | | Move Scene.ObjectSaleInfo() to this
* minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-131-1/+1
|
* refactor: move Scene.TerrainUnAcked() handling into TerrainModuleJustin Clark-Casey (justincc)2010-08-132-9/+8
|
* minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-131-1/+1
|
* refactor: remove Scene.SetRootAgentScene() in favour of existing event with ↵Justin Clark-Casey (justincc)2010-08-134-21/+10
| | | | same name
* refactor: move more map tile generation code from scene to IWorldMapModuleJustin Clark-Casey (justincc)2010-08-134-32/+25
|