Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-19 | 1 | -40/+28 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-19 | 1 | -40/+28 |
| |\ | |||||
| | * | Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943." | Diva Canto | 2010-08-19 | 1 | -40/+28 |
| | | | | | | | | | | | | | | | | | | 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 | ||||
* | | 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' into careminster-presence-refactor | Melanie | 2010-08-19 | 37 | -4362/+51 |
|\ \ | |/ | |||||
| * | 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 | 1 | -28/+40 |
| | |\ | |||||
| | * | | 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 | 1 | -28/+40 |
| |/ | | | | | | | (Files .xml and .txt also want to be committed) | ||||
| * | Prevent a bad cast in llCreateLink(). | Melanie Thielker | 2010-08-18 | 1 | -1/+5 |
| | | |||||
* | | Revert "Adding Group managment to the offline system" | Melanie Thielker | 2010-08-19 | 1 | -1/+0 |
| | | | | | | | | | | | | This reverts commit 7c673c79d4c52fa14ed803754a18d56bcf54ad87. That module only handles text IM | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-08-19 | 1 | -0/+1 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Adding Group managment to the offline system | sacha | 2010-08-19 | 1 | -0/+1 |
| | | | | | | | | | | | | Sending a group invite is offlined now | ||||
* | | | Skip conversion if fields that are null in the database. This may | Melanie Thielker | 2010-08-19 | 1 | -0/+4 |
|/ / | | | | | | | uncover errors elsewhere. | ||||
* | | Prevent a bad cast in llCreateLink(). | Melanie Thielker | 2010-08-18 | 1 | -1/+5 |
| | | |||||
* | | Fix a typecasting issue in llList2Float. This addresses mantis #262 | meta7 | 2010-08-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-18 | 66 | -600/+1093 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 63 | -596/+1089 |
| |\ \ | | |/ | |||||
| | * | * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() ↵ | John Hurliman | 2010-08-17 | 3 | -3/+3 |
| | | | | | | | | | | | | to fix the build | ||||
| | * | 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). | ||||
| | * | 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 | 1 | -0/+143 |
| | | | | | | | | | | | | 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. | ||||
| | * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-13 | 10 | -63/+62 |
| | | | |||||
| | * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -3/+2 |
| | | | |||||
| | * | refactor: move binary statistics logging from scene into separate region module | Justin Clark-Casey (justincc) | 2010-08-13 | 3 | -110/+181 |
| | | | |||||
| | * | refactor: move Scene.PerformObjectBuy into BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 6 | -173/+222 |
| | | | |||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -3/+3 |
| | | | |||||
| | * | Establish new Objects/BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 2 | -22/+99 |
| | | | | | | | | | | | | Move Scene.ObjectSaleInfo() to this | ||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -1/+1 |
| | | | |||||
| | * | refactor: move Scene.TerrainUnAcked() handling into TerrainModule | Justin Clark-Casey (justincc) | 2010-08-13 | 2 | -9/+8 |
| | | | |||||
| | * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -1/+1 |
| | | | |||||
| | * | refactor: remove Scene.SetRootAgentScene() in favour of existing event with ↵ | Justin Clark-Casey (justincc) | 2010-08-13 | 4 | -21/+10 |
| | | | | | | | | | | | | same name |