5155915de1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-20 19:36:04 +01:00
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
e31a5260c8
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-20 11:10:21 -07:00
4463ebfbc2
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-20 11:09:21 -07:00
f347d25675
Unit test breakage fix.
2010-08-20 11:09:02 -07:00
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
a87840bd1c
Make some small corrections to ini.example file changes. These are not functional changes.
2010-08-20 18:25:44 +01:00
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
86a61696d7
minor: remove mono compiler warning
2010-08-20 17:58:02 +01:00
4708083434
Use the database mthod directly to delete items in a single sql swoop
2010-08-20 18:53:33 +02:00
b1790ba56e
Delete items as well as folders in XInventoryService.PurgeFolder - this should make emptying the trash work properly.
2010-08-20 11:25:31 -07:00
187ccd72f0
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-20 11:01:03 -07:00
cc8864b0e3
Get maturity level from access number. This addresses mantis #269
2010-08-20 11:00:14 -07:00
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
6f83b0ee46
Cleaned up a few more things related to incoming agents.
2010-08-20 09:02:05 -07:00
82abaadd55
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-20 08:36:54 +01:00
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
47838e5fb3
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:46:46 +02:00
b4e7c62fbc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-19 19:55:03 -07:00
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
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
1ab631f015
Merge branch 'master' into careminster-presence-refactor
2010-08-19 20:25:17 +01:00
f639a9e5ae
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 20:24:46 +01:00
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
a1074cad5c
Short-circuit the grid server lookup for RequestSimulatorData if the region
...
info is requested for is the local region
2010-08-19 20:41:55 +02:00
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
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
77705145a0
Merge branch 'master' into careminster-presence-refactor
2010-08-19 11:47:50 +01:00
ee7c799699
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 11:46:07 +01:00
f58a809536
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 11:45:56 +01:00
1a8a11140c
Revert "Adding Group managment to the offline system"
...
This reverts commit 7c673c79d4
2010-08-19 12:04:46 +02:00
fdc59ee802
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-19 12:02:26 +02:00
0344395776
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 12:01:40 +02:00
7c673c79d4
Adding Group managment to the offline system
...
Sending a group invite is offlined now
2010-08-19 08:31:51 +00:00
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
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
5e3d53bef2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-19 00:54:48 +01:00
85f448642b
minor: Correct string format in "Can't find linkset root prim" message
2010-08-19 00:54:09 +01:00
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
8c12f22140
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-18 23:15:25 +01:00
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
6ddf124c8a
Prevent a bad cast in llCreateLink().
2010-08-18 20:00:19 +01:00
fb2deb0d45
Prevent a bad cast in llCreateLink().
2010-08-18 20:17:20 +02:00
810840b862
Fix a typecasting issue in llList2Float. This addresses mantis #262
2010-08-18 04:23:56 -07:00
ca8b1e488c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-18 02:53:27 -07:00
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
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
e1f2c32284
* Updated to OpenMetaverse.StructuredData.dll that includes implicit typecasts going in the other direction
2010-08-17 12:26:20 -07:00
53190e332d
Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecasts
2010-08-17 12:04:37 -07:00
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
Justin Clark-Casey (justincc)