aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-2121-470/+585
|\
| * Forward-port a small improvement to the land out connectorMelanie Thielker2010-08-211-1/+2
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-206-20/+65
| |\
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-202-18/+52
| | |\
| | * | Unit test breakage fix.Diva Canto2010-08-206-20/+65
| | | |
| * | | Some code cleanup for console command "create region".Marck2010-08-202-31/+36
| | |/ | |/| | | | | | | | | | | | | Make region name an optional command parameter. Avoid question for region name if it has already been specified. Extend help text.
| * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-201-9/+9
| | |
| * | Some code cleanup for console command alert.Marck2010-08-201-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 Canto2010-08-201-45/+42
| |
| * 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-202-17/+54
| | |/ | |/| | | | | | | to make it more configurable.
* | | Forward-port a small improvement to the land out connectorMelanie Thielker2010-08-211-1/+2
| | |
* | | Someone from germany broke the build :P mentioning no namesmeta72010-08-201-1/+1
| | |
* | | Use the database mthod directly to delete items in a single sql swoopMelanie Thielker2010-08-201-11/+1
| | |
* | | Delete items as well as folders in XInventoryService.PurgeFolder - this ↵meta72010-08-201-0/+11
| | | | | | | | | | | | should make emptying the trash work properly.
* | | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-2040-4357/+79
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie Thielker2010-08-202-21/+53
| | | | | | | | | | | | | | | | to make it more configurable.
| * | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-191-40/+28
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-191-40/+28
| | |\ \ | | | |/
| | | * Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."Diva Canto2010-08-191-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 regionMelanie Thielker2010-08-191-1/+6
| | |/ | | | | | | | | | info is requested for is the local region
| * | 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' into careminster-presence-refactorMelanie2010-08-1937-4362/+51
| |\ \ | | |/
| | * 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-191-28/+40
| | | |\
| | | * | 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-181-28/+40
| | |/ | | | | | | | | | (Files .xml and .txt also want to be committed)
| | * Prevent a bad cast in llCreateLink().Melanie Thielker2010-08-181-1/+5
| | |
| * | Revert "Adding Group managment to the offline system"Melanie Thielker2010-08-191-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit 7c673c79d4c52fa14ed803754a18d56bcf54ad87. That module only handles text IM
| * | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-08-191-0/+1
| |\ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| | * | Adding Group managment to the offline systemsacha2010-08-191-0/+1
| | | | | | | | | | | | | | | | Sending a group invite is offlined now
| * | | Skip conversion if fields that are null in the database. This mayMelanie Thielker2010-08-191-0/+4
| |/ / | | | | | | | | | uncover errors elsewhere.
| * | Prevent a bad cast in llCreateLink().Melanie Thielker2010-08-181-1/+5
| | |
* | | Get maturity level from access number. This addresses mantis #269meta72010-08-201-0/+6
|/ /
* | Fix a typecasting issue in llList2Float. This addresses mantis #262meta72010-08-181-1/+1
| |
* | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-1866-600/+1093
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-1863-596/+1089
| |\ \ | | |/
| | * * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() ↵John Hurliman2010-08-173-3/+3
| | | | | | | | | | | | to fix the build
| | * 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).
| | * 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
| | |