Justin Clark-Casey (justincc)
1d01c91095
minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs
2010-08-23 23:21:44 +01:00
Justin Clark-Casey (justincc)
704a53fb9b
Fix bug in llGiveInventory() where items were disappearing on relog
...
This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set
This may have been broken since commit bd49985a
on 2010-05-02
2010-08-23 23:16:48 +01:00
Justin Clark-Casey (justincc)
74e5fe5aa9
Remove various warnings and improve logging messages. No functional changes.
2010-08-23 22:24:23 +01:00
Melanie
8d8436e0ca
Correct a minor typo
2010-08-21 20:59:25 +01:00
Melanie
f445659dd3
Finally putting estate_settings.xml to rest. There will be no more attempts
...
to read or write this file.
2010-08-21 17:38:47 +01:00
Melanie Thielker
954329ec85
Don't allow oversized search reply packets
2010-08-21 17:30:41 +01:00
Melanie Thielker
ea1df09fa4
Forward-port a small improvement to the land out connector
2010-08-21 00:29:27 +01:00
Justin Clark-Casey (justincc)
5155915de1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-20 19:36:04 +01:00
Marck
7aad5af498
Some code cleanup for console command "create region".
...
Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text.
2010-08-20 19:35:52 +01:00
Diva Canto
e31a5260c8
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-20 11:10:21 -07:00
Diva Canto
4463ebfbc2
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-20 11:09:21 -07:00
Diva Canto
f347d25675
Unit test breakage fix.
2010-08-20 11:09:02 -07:00
Ai Austin
c41ff51bd3
OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section away from end and correction of typo "fro" (fixes Mantis 4833)
2010-08-20 19:08:26 +01:00
Justin Clark-Casey (justincc)
a87840bd1c
Make some small corrections to ini.example file changes. These are not functional changes.
2010-08-20 18:25:44 +01:00
Ai Austin
2c0ba8718a
Robust.ini.example and Robust.HG.ini.example default: corrected comment about realm for UserAccountService to state default is useraccount, and include default realm commented out in every case
2010-08-20 18:03:21 +01:00
Justin Clark-Casey (justincc)
86a61696d7
minor: remove mono compiler warning
2010-08-20 17:58:02 +01:00
Marck
bb5dd9fbbc
Some code cleanup for console command alert.
...
Made parsing of parameters more robust.
Allow general alerts without specifying keyword 'general'.
Extended help texts.
2010-08-20 17:53:21 +01:00
Diva Canto
6f83b0ee46
Cleaned up a few more things related to incoming agents.
2010-08-20 09:02:05 -07:00
Melanie
82abaadd55
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-20 08:36:54 +01:00
Melanie
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
Diva Canto
b4e7c62fbc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-19 19:55:03 -07:00
Diva Canto
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
Diva Canto
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
Melanie
f639a9e5ae
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 20:24:46 +01:00
Melanie Thielker
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
Diva Canto
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
Diva Canto
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
Melanie
ee7c799699
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 11:46:07 +01:00
Melanie Thielker
f58a809536
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 11:45:56 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
5e3d53bef2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-19 00:54:48 +01:00
Justin Clark-Casey (justincc)
85f448642b
minor: Correct string format in "Can't find linkset root prim" message
2010-08-19 00:54:09 +01:00
Diva Canto
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
Justin Clark-Casey (justincc)
8c12f22140
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-18 23:15:25 +01:00
Justin Clark-Casey (justincc)
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
Melanie Thielker
6ddf124c8a
Prevent a bad cast in llCreateLink().
2010-08-18 20:00:19 +01:00
John Hurliman
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
John Hurliman
e1f2c32284
* Updated to OpenMetaverse.StructuredData.dll that includes implicit typecasts going in the other direction
2010-08-17 12:26:20 -07:00
John Hurliman
53190e332d
Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecasts
2010-08-17 12:04:37 -07:00
Diva Canto
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
Diva Canto
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
Diva Canto
a8b80ef800
Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files affected.
2010-08-16 11:39:46 -07:00
Diva Canto
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
Diva Canto
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
Diva Canto
a5044e08fb
Better comment (related to previous commit)
2010-08-15 18:13:09 -07:00
Diva Canto
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
Marck
30d0bf4207
Fix SQLite database plugin for UserAccountData queries with a single word.
2010-08-15 17:27:06 -07:00
Diva Canto
d5c24241b7
Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG)
2010-08-15 17:25:27 -07:00
John Hurliman
96e4099564
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-13 17:40:18 -07:00