090bf7acca
Correct a coordinate to make the viewer like it
2012-01-24 01:17:41 +00:00
8fcb9bf418
Correct some SQL syntax
2012-01-24 00:57:52 +00:00
7a87be5015
Fix merge artefacts and build break
2012-01-24 00:45:17 +00:00
616f2b5861
Merge branch 'master' into careminster
2012-01-24 00:38:34 +00:00
7bb01a17ee
Add a forgotten parameter
2012-01-24 00:38:00 +00:00
07ad821157
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/RegionSettings.cs
2012-01-24 00:36:42 +00:00
87799c1f3d
Change Telehubs to store only the data that is really needed and not
...
additional redundant information.
2012-01-24 00:32:10 +00:00
c36c916342
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-23 21:25:59 +00:00
48379e6442
IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since the
...
Telehub commits! They will eat your babies and corrupt your database while
they munch. DO NOT use anything from the first Telehub commit to this one.
FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned.
2012-01-23 21:23:55 +00:00
8db64dc77f
Merge branch 'master' of /home/opensim/var/repo/opensim into telehub
2012-01-23 14:54:43 -05:00
6a85abbd14
Add update to Telehub position and rotation before adding SpawnPoints
2012-01-23 14:53:25 -05:00
c1f6478a37
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-23 11:10:56 -05:00
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
Melanie