0037577814
Merge branch 'telehub'
2012-01-23 11:10:42 -05:00
9cfc43005d
Cleanup
2012-01-23 10:28:18 -05:00
39c9b656c8
Cleanup unused parts, add some error handling
2012-01-23 09:42:15 -05:00
22ae9331bb
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-23 13:51:20 +01:00
4e0bb49394
Fix llLookAt the right way
2012-01-23 13:48:16 +01:00
cd2bf64b87
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-01-23 00:24:31 +00:00
f7bd7c5901
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-22 23:21:35 +00:00
7c404375c7
Fix up some parameter naming
2012-01-22 23:20:10 +00:00
d1ef7ee5ca
Add note about setting up test databases
2012-01-22 16:27:49 -05:00
74c1ed77a4
Finish connecting Telehub to database
2012-01-22 14:51:15 -05:00
1cd26ba85e
Hooking up new telehub data to the database
2012-01-22 11:46:16 -05:00
02572ab1d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
2012-01-22 16:35:14 +00:00
24b20f6e4b
Change the key name I missed in last commit
2012-01-22 15:35:14 +00:00
68365c20c0
Move Telehub tables and data from EstateSettings to RegionSettings.
...
This is damage control es EstateSettings is not the place this can be put.
EstateSettings is nt unique to a region and therefore would introduce
a hard limit of one telehub per estate, completely shutting off the
option of having SL style telehubs, e.g. one per region. Whole
estate teleport routing can still be implemented id desiresd, this
way all options are open while the other way most options get closed
off.
2012-01-22 11:36:04 +00:00
32d58d6e3e
Telehub Support:
...
Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
2012-01-21 23:26:27 -05:00
ba3b0c69f1
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
590f707c42
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-20 23:54:29 -05:00
b6f3de5028
Telehub Support:
...
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
2012-01-20 23:50:37 -05:00
a0fb1e1788
Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE."
...
This reverts commit 4eef6725f4
2012-01-20 17:51:12 +00:00
ea72428c9d
Allow a viewer UDP image request retry to trigger another asset fetch if an existing fetch hasn't responded before a timeout.
...
This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason.
2012-01-19 23:09:16 +00:00
d38e2c0c91
Add image not in database test for LLImageManager
2012-01-19 21:57:12 +00:00
503faaea62
refactor: separate out common parts of LLImageManagerTests
2012-01-19 21:23:40 +00:00
381f74276b
Add LLImageManager regression test for discard case
2012-01-19 21:14:09 +00:00
c92a9a6640
Add "image queues clear <first-name> <last-name>" console command
...
This allows a way to manually clear pending image queue requests for debug purposes
2012-01-19 19:49:06 +00:00
d75899f2d1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-19 19:47:18 +00:00
8f871cca10
Add osGetGridHomeURI function
...
Add osGetHomeURI function to the family of osGetGrid* functions. Returns the SRV_HomeURI setting from the [LoginService] configuration.
2012-01-19 14:21:12 -05:00
9356963bd3
Add basic request and send image regression tests for LLImageManager
2012-01-19 19:00:11 +00:00
edb2e4c5b3
Change URI to lowercase to match existing
2012-01-19 13:55:53 -05:00
bf9ce4709f
Add fetching of SRV_HomeURI to "/json_grid_info"
...
Make SRV_HomeURI available on the GridInfoService through the "/json_grid_info" URI. This i s mainly to service OSSL, but can be seen externally via the URI.
2012-01-19 13:48:31 -05:00
e41f23dead
Trigger event when prims are scheduled for an update. This gives modules early access to changed parameters.
2012-01-19 03:06:35 -08:00
5ced49aaa8
Cleaned up Color and Text parameters in SOP and made LocalFlags public for module access.
2012-01-19 03:03:22 -08:00
2c6272d11a
Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID
2012-01-19 03:01:37 -08:00
f8079bcd72
Fixed bugs in earlier commit on custom user parameters in Regions.ini
2012-01-19 02:52:05 -08:00
eea726d74e
RegionReady:
...
Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
2012-01-18 20:30:57 -05:00
e7619f7518
Merge branch 'master' of /home/opensim/src/opensim
2012-01-17 22:44:16 -05:00
ba7d8cedec
Add function osGetGridCustom
...
Add function osGetGridCustom to take an argument for the GridInfo kpv to retrieve from the GridInfoService
2012-01-17 22:38:36 -05:00
717656c453
Merge branch 'master' of /home/opensim/src/opensim
2012-01-17 22:10:47 -05:00
9ed9720861
Update osGetGrid**** functions
...
The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
2012-01-17 22:07:40 -05:00
939d60da59
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
2012-01-17 21:10:31 -05:00
ef5575be1b
Add json handler for GridInfo
2012-01-17 21:09:46 -05:00
4eef6725f4
Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE.
...
As discussed on the opensim-dev mailing list, this is to avoid a demonstrated ODE collider segfault when stress-testing a simulator running more than one region using the bundled pCampbot.exe
As before, the ODE revision used is r1755 - only the collider has changed.
Tests so far reveal little performance change.
However, if noticeable issues do arise, please report on mantis and/or the opensim-dev mailing list.
The previous libraries are temporarily in bin/Physics-previous-ode-libs
These can be copied back to bin if one wants to compare behaviour with the previous libraries.
2012-01-17 20:49:20 +00:00
08b6b3bb48
Add some logging
2012-01-17 17:36:26 +01:00
5afb70b9fe
Fix prim calculations so that > 32767 prims are supported
2012-01-17 15:30:52 +01:00
747c25e920
Spin off NPC deletion into a thread to avoid it being done on a script
...
microthread. A stab at fixing exceptions.
2012-01-17 11:18:56 +01:00
7549836986
Merge branch 'master' into careminster
2012-01-16 23:10:41 +00:00
e13a17cc0c
Allow retrival of multiple user records in one operation, analog to presence
2012-01-16 23:09:24 +00:00
b14a6acd2f
Merge branch 'master' into careminster
2012-01-16 23:08:47 +00:00
59a0c50d48
Comment out noisy log lines I accidentally included in the nant build target adjustment commit.
...
Left in the method doc.
2012-01-16 23:04:08 +00:00
82ad9d4e04
Remove monocov and other obsolete nant build targets.
...
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
2012-01-16 22:58:58 +00:00
d6b9504c84
Add methods to allow the groups modules to query online status and last login
2012-01-16 02:19:19 +01:00
BlueWall