Melanie
6ae73aea49
Merge branch 'master' into careminster-presence-refactor
2011-06-20 03:11:34 +01:00
Melanie
163ee82168
Add some flags to control content in search better
2011-06-20 02:29:09 +02:00
Diva Canto
7819b4a794
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-16 17:15:12 -07:00
Diva Canto
409738726d
Added a couple of guards and warnings to the MapImage/MapImageServiceModule.
2011-06-16 17:14:41 -07:00
Mic Bowman
ad84728aba
Add localID to physical object creation functions.
2011-06-15 11:31:32 -07:00
Mic Bowman
29da57e380
Add the PhysActor to the correct SOP when duplicating a physical
...
prim. Thanks, MisterBlue
2011-06-15 11:26:45 -07:00
Mic Bowman
289c8fe1bc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-15 11:24:29 -07:00
Mic Bowman
7a4fbdac7c
Added an expiring cache for region information to the
...
RemoteGridService connector. Timeout is currently set at five
minutes. Negative results are not cached.
The result is that operations like send an instant message do
not have to go through the grid service every time.
2011-06-15 11:22:51 -07:00
Diva Canto
5b7ab50319
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-15 11:11:54 -07:00
Diva Canto
bbe489e64a
Added missing config var for map image service.
2011-06-15 11:11:14 -07:00
Justin Clark-Casey (justincc)
603dbea190
tweak messages. Make verbose inventory item save message give the item name as well as item id and asset id
2011-06-14 00:51:18 +01:00
Diva Canto
822b9e085f
Added SimulatorFeatures capability. Thanks Aurora devs for the bootstrap on the contents of the response.
...
Changed the experimental capability introduced a couple of commits ago: now sending that extra information as part of the response in the SimulatorFeatures cap.
2011-06-13 10:21:29 -07:00
Diva Canto
c62ccc75a1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-13 09:14:17 -07:00
Diva Canto
ecb28ae130
V2 map now working in grids too. WARNING: A few visible configuration variables added in order for this to work. See .ini.example changes
2011-06-13 09:13:44 -07:00
Diva Canto
ab11835aeb
Same processing of the "/" in the MapImageService Cap as the one in the login service.
2011-06-13 07:59:28 -07:00
Diva Canto
0e4db3ca39
Added experimental new capability URL called MapImageService meant to work with Kokua viewer if devs are willing to do it.
2011-06-13 07:56:52 -07:00
Melanie
9b1d3f0c38
Merge branch 'master' into careminster-presence-refactor
2011-06-13 12:38:17 +01:00
Michael Cerquoni aka Nebadon Izumi
dc978d02a7
match water color for warp3d map tiler and adjust lighting
2011-06-13 12:37:43 +01:00
Diva Canto
4b9de140ab
Add credit and link to SimianGrid project. Thanks, guys!
2011-06-12 22:25:30 -07:00
Diva Canto
95e050130c
People are bound to forget the '/' at the end of MapTileURL, so let's correct that from the inside.
2011-06-12 22:10:16 -07:00
Diva Canto
2e77518c6d
bit depth: 24!!! begeez! -- zoom levels work now.
2011-06-12 21:51:26 -07:00
Diva Canto
07d7c1cd2d
Trailing / in MapTileURL must be there!
2011-06-12 18:29:44 -07:00
Diva Canto
78c16da544
A few bug fixes on map V2. Zoom level weirdness still there.
2011-06-12 17:05:45 -07:00
Diva Canto
fd57c91b4a
First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD.
2011-06-12 15:37:42 -07:00
Diva Canto
06e254c392
A few more cleanups on the way to close http://opensimulator.org/mantis/view.php?id=5516 once and for all. Moral of the story: don't send AgentOnline/Offline to viewers with a zero-length array.
2011-06-11 17:48:19 -07:00
Diva Canto
e1ca77a0db
Only send AgentOnline to the client if the friendsOnline list has elements. Also, increased the timeout on UserAgentServiceConnector, StatusNotification again.
2011-06-11 17:22:35 -07:00
Diva Canto
d992779397
Switched order of SQL statements in Friends migration -- resulted in the wrong key
2011-06-11 09:36:57 -07:00
Melanie
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01:00
Diva Canto
e07d71d298
Added a Sleep in between each site call, to slow the xml-rpc requests down.
2011-06-10 21:17:34 -07:00
Diva Canto
5f311c91c7
More tweaking on the UserAgentServiceConnector: add constructor that does not do DNS lookup, and use that for friends notification.
2011-06-10 21:07:50 -07:00
Diva Canto
0ae022d688
Decreased timeout of HG StatusNotification to 4secs. http://opensimulator.org/mantis/view.php?id=5516
2011-06-10 20:59:57 -07:00
Diva Canto
487cb51f69
3rd way of reseting the HG Map. This time, don't use the grid service; instead keep track of which map blocks each client has seen in the region, and reset exactly those when the client closes.
2011-06-10 17:22:17 -07:00
Justin Clark-Casey (justincc)
9a62bfab0e
If the flotsam asset cache console command "fcache clear" is specified on its own, clear both memory and file caches
2011-06-11 00:50:20 +01:00
Justin Clark-Casey (justincc)
39e878eb8f
Align CenomeCache.ini.example values with CenomeCache defaults.
2011-06-11 00:35:31 +01:00
Justin Clark-Casey (justincc)
c7cef650db
Make it clear that WaitOnInprogressTimeout is currently a dead setting in FlotsamCache.ini.example
2011-06-11 00:10:40 +01:00
Justin Clark-Casey (justincc)
b13b54c526
Make the internal flotsam asset cache defaults match config-include/FlotsamCache.ini.example. Enable the flotsam console commands even if FlotsamCache.ini isn't present.
...
For the most part, defaults are made to match those already in FlotsamCache.ini.example.
The one exception is that the 48 hour file timeout from the code is used instead of the 0 hours that was in the example file. This can be tweaked if necessary.
Most importantly, the default cache directory is now ./assetcache (as in FlotsamCache.ini.example) rather than ./FlotsamAssetCache (as was the internal code default).
Therefore, if you were using flotasm without using the config file, then please rename your cache directory or start using the ini file and change the default there if you want to keep using your existing cache.
2011-06-11 00:04:21 +01:00
Justin Clark-Casey (justincc)
fc7e17baf7
When serializing objects, stop accidentally using the green text colour value for alpha
...
This addresses http://opensimulator.org/mantis/view.php?id=5111
2011-06-10 21:49:25 +01:00
Makopoppo
c7bdb66a1f
Added missing "Old Guids=true" to ConnectionString
2011-06-10 21:10:37 +01:00
Oren Hurvitz
804fe2d9b0
Save the sun's position in OARs
2011-06-10 20:55:58 +01:00
Justin Clark-Casey (justincc)
08db3c5a8e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-10 20:42:15 +01:00
Justin Clark-Casey (justincc)
b5518dc906
minor: Add some commented out destructor logging messages for potential future use.
...
At the moment, client and scene objects are being garbage collected as expected, at least in simple scenarios.
2011-06-10 20:40:14 +01:00
Diva Canto
eeac2275c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-10 09:17:06 -07:00
Diva Canto
98d1e7768a
New method for resetting the map on HG: do it only once upon changing grids, and reset only exactly the map blocks that had regions in them. WARNING: this fetches all the regions from the Grid service, so there is a chance that this is a really bad idea in large grids. Pushing it for testing.
2011-06-10 09:16:43 -07:00
dahlia
387b228d68
partial update for new mesh asset format - handle both old and new formats for physics mesh
2011-06-10 00:38:38 -07:00
Justin Clark-Casey (justincc)
9149ef6c89
For MySQL, migrate region tables to the MyISAM storage engine rather than InnoDB
...
Using MyISAM proves vastly faster for persisting scene objects.
For instance, a scene object that took 9 seconds to persist before now takes 1. This also improves the experience of loading large OARs.
We don't use any of the transactional features of InnoDB.
The only thing that may have an impact is that InnoDB does row locking on inserts while MyISAM does table locking.
However, field reports say there is no noticeable difference.
2011-06-10 02:33:50 +01:00
Justin Clark-Casey (justincc)
d780500c58
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-10 02:29:30 +01:00
Justin Clark-Casey (justincc)
2bc8dcfdbd
minor: add method doc to make it clear that click action is fired when the click action is changed, not when a prim is clicked
2011-06-10 02:27:45 +01:00
Diva Canto
8d3a8a0a81
The map breakage is actually at 2048!
2011-06-09 16:51:47 -07:00
Diva Canto
e3e1f6308d
Change the name of the newest command to "show names" so that it doesn't conflict with the existing "show users"
2011-06-09 16:11:47 -07:00
Diva Canto
4cf60c5d9d
Removing special casing on failures. This may also fix reports of this issue:
...
22:07:53 - [USER AGENT CONNECTOR]: remote call to http://hg.osgrid.org:80/ returned an error: Requested method [locate_user] from 127.0.0.1 threw exception: Object reference not set to an instance of an object at OpenSim.Services.HypergridService.UserAgentService.LocateUser (UUID userID) [0x00000] in <filename unknown>:0
2011-06-08 19:51:48 -07:00