Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-20 | 6 | -20/+65 |
|\ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-20 | 1 | -27/+32 |
| |\ | |||||
| * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-20 | 4 | -70/+109 |
| |\ \ | |||||
| * | | | Unit test breakage fix. | Diva Canto | 2010-08-20 | 6 | -20/+65 |
| | | | | |||||
* | | | | Some code cleanup for console command "create region". | Marck | 2010-08-20 | 2 | -31/+36 |
| |_|/ |/| | | | | | | | | | | | | | | Make region name an optional command parameter. Avoid question for region name if it has already been specified. Extend help text. | ||||
* | | | OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section ↵ | Ai Austin | 2010-08-20 | 1 | -27/+32 |
| |/ |/| | | | | | away from end and correction of typo "fro" (fixes Mantis 4833) | ||||
* | | Make some small corrections to ini.example file changes. These are not ↵ | Justin Clark-Casey (justincc) | 2010-08-20 | 2 | -20/+12 |
| | | | | | | | | functional changes. | ||||
* | | Robust.ini.example and Robust.HG.ini.example default: corrected comment ↵ | Ai Austin | 2010-08-20 | 2 | -40/+53 |
| | | | | | | | | about realm for UserAccountService to state default is useraccount, and include default realm commented out in every case | ||||
* | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-20 | 1 | -9/+9 |
| | | |||||
* | | Some code cleanup for console command alert. | Marck | 2010-08-20 | 1 | -9/+43 |
|/ | | | | | | Made parsing of parameters more robust. Allow general alerts without specifying keyword 'general'. Extended help texts. | ||||
* | Cleaned up a few more things related to incoming agents. | Diva Canto | 2010-08-20 | 1 | -45/+42 |
| | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-20 | 11 | -164/+213 |
|\ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-08-19 | 1 | -1/+6 |
| |\ | |||||
| * | | Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵ | Diva Canto | 2010-08-19 | 4 | -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 Canto | 2010-08-19 | 8 | -47/+167 |
| | | | | | | | | | | | | untested. Committing to move to my other computer. | ||||
* | | | Add some maptile options, change maptile generation from OpenSimBase to Scene | Melanie | 2010-08-20 | 3 | -17/+60 |
| |/ |/| | | | | | to make it more configurable. | ||||
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-19 | 1 | -40/+28 |
|\ \ | |/ | |||||
| * | These files want to be committed. This time I'm doing it separately from ↵ | Diva Canto | 2010-08-19 | 2 | -327/+327 |
| | | | | | | | | other commits. | ||||
| * | Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943." | Diva Canto | 2010-08-19 | 3 | -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 region | Melanie Thielker | 2010-08-19 | 1 | -1/+6 |
|/ | | | | info is requested for is the local region | ||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-19 | 36 | -4334/+11 |
|\ | |||||
| * | Improve some logging in LandConnector | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -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-19 | 34 | -4327/+0 |
| | | | | | | | | Current policy is that OpenSim core is not the place for gui tools | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-19 | 3 | -355/+367 |
| |\ | |||||
| * | | minor: Correct string format in "Can't find linkset root prim" message | Justin Clark-Casey (justincc) | 2010-08-19 | 1 | -1/+1 |
| | | | |||||
* | | | Skip conversion if fields that are null in the database. This may | Melanie Thielker | 2010-08-19 | 1 | -0/+4 |
| |/ |/| | | | | | uncover errors elsewhere. | ||||
* | | One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943. | Diva Canto | 2010-08-18 | 3 | -355/+367 |
|/ | | | | (Files .xml and .txt also want to be committed) | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-18 | 17 | -30/+83 |
|\ | |||||
| * | Prevent a bad cast in llCreateLink(). | Melanie Thielker | 2010-08-18 | 1 | -1/+5 |
| | | |||||
| * | * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() ↵ | John Hurliman | 2010-08-17 | 3 | -3/+3 |
| | | | | | | | | to fix the build | ||||
| * | * Updated to OpenMetaverse.StructuredData.dll that includes implicit ↵ | John Hurliman | 2010-08-17 | 1 | -0/+0 |
| | | | | | | | | typecasts going in the other direction | ||||
| * | Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecasts | John Hurliman | 2010-08-17 | 1 | -0/+0 |
| | | |||||
| * | Fixes mantis #4954 for the xml-rpc calls of the UserAgentServiceConnector. ↵ | Diva Canto | 2010-08-16 | 1 | -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 Canto | 2010-08-16 | 1 | -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 Canto | 2010-08-16 | 8 | -0/+32 |
| | | | | | | | | affected. | ||||
| * | Work on TeleportStart: renamed method from TeleportLocationStart to ↵ | Diva Canto | 2010-08-16 | 13 | -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-18 | 45 | -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 Canto | 2010-08-16 | 1 | -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 Canto | 2010-08-15 | 1 | -1/+1 |
| | |||||
* | Addresses mantis #4929. Agent was being logged off the grid too soon -- ↵ | Diva Canto | 2010-08-15 | 2 | -6/+23 |
| | | | | things may still fail. | ||||
* | Fix SQLite database plugin for UserAccountData queries with a single word. | Marck | 2010-08-15 | 1 | -1/+1 |
| | |||||
* | Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG) | Diva Canto | 2010-08-15 | 1 | -1/+10 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-08-13 | 1 | -6/+4 |
|\ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-14 | 2 | -2/+2 |
| |\ | |||||
| * | | In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from ↵ | Justin Clark-Casey (justincc) | 2010-08-14 | 1 | -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.cs | John Hurliman | 2010-08-13 | 1 | -12/+27 |
| |/ |/| | |||||
* | | * Fixed a casing typo for Simian profile data | John Hurliman | 2010-08-13 | 2 | -2/+2 |
|/ | | | | * Minor logging tweak in Simian asset connector | ||||
* | Unit test for ConfigurationLoader. | Marck | 2010-08-13 | 3 | -0/+176 |
| | | | | Adds a new test assembly for OpenSim. | ||||
* | Configuration files can read include files from relative paths. | Marck | 2010-08-13 | 2 | -2/+22 |
| | |||||
* | Updated the create_region command in the RemoteAdmin plugin to properly ↵ | randomhuman | 2010-08-13 | 6 | -68/+134 |
| | | | | support estates without seeking further input on the console. |