e6141db0dc
* Switched Intel license for OpenSim contributors in DSG files
...
* Added Intel Corporation copyright for DSG to contributors.txt file
* Removed non-DSG bullet development files
2011-06-17 15:18:31 -07:00
7819b4a794
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-16 17:15:12 -07:00
409738726d
Added a couple of guards and warnings to the MapImage/MapImageServiceModule.
2011-06-16 17:14:41 -07:00
c46f8ab291
Line ending conversion.
2011-06-16 14:19:46 -07:00
492d684911
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-06-16 09:51:40 -07:00
2c27067dec
Fixed typo in merge
2011-06-15 15:38:16 -07:00
b6d93d0c40
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/GridDialogModule.cs
2011-06-15 15:26:17 -07:00
66f905b09c
Fixed up merge conflicts from master due to changes in sending IMs
...
between DSG regions
2011-06-15 15:05:17 -07:00
327f30e6d1
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2011-06-15 14:13:58 -07:00
97ea994a4b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-15 13:43:57 -07:00
8791e5dac0
Working out merge errors with master
2011-06-15 13:43:02 -07:00
ad84728aba
Add localID to physical object creation functions.
2011-06-15 11:31:32 -07:00
29da57e380
Add the PhysActor to the correct SOP when duplicating a physical
...
prim. Thanks, MisterBlue
2011-06-15 11:26:45 -07:00
289c8fe1bc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-15 11:24:29 -07:00
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
5b7ab50319
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-15 11:11:54 -07:00
bbe489e64a
Added missing config var for map image service.
2011-06-15 11:11:14 -07:00
c0c9a1d9da
Line ending convertion.
2011-06-15 09:55:52 -07:00
9c15c8897e
Merge branch 'master' into dev
2011-06-14 23:16:48 -07:00
fc67a9212e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-14 23:16:02 -07:00
32ddcefaca
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
2011-06-14 23:15:34 -07:00
941cec5548
Added code to propagate ScriptLandCollidingStart, ScriptLandColliding, and
...
ScriptLandCollidingEnd events.
2011-06-14 16:48:21 -07:00
57a42508ec
Added AbsolutePosition as another SOP property to sync across, yet made
...
it a group property, so that only RootPart will trigger a sync message
for this property. An optimization to avoid sending many position updates
for linkset objects.
2011-06-14 14:53:12 -07:00
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
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
c62ccc75a1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-13 09:14:17 -07:00
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
ab11835aeb
Same processing of the "/" in the MapImageService Cap as the one in the login service.
2011-06-13 07:59:28 -07:00
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
dc978d02a7
match water color for warp3d map tiler and adjust lighting
2011-06-13 12:37:43 +01:00
4b9de140ab
Add credit and link to SimianGrid project. Thanks, guys!
2011-06-12 22:25:30 -07:00
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
2e77518c6d
bit depth: 24!!! begeez! -- zoom levels work now.
2011-06-12 21:51:26 -07:00
07d7c1cd2d
Trailing / in MapTileURL must be there!
2011-06-12 18:29:44 -07:00
78c16da544
A few bug fixes on map V2. Zoom level weirdness still there.
2011-06-12 17:05:45 -07:00
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
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
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
d992779397
Switched order of SQL statements in Friends migration -- resulted in the wrong key
2011-06-11 09:36:57 -07:00
e07d71d298
Added a Sleep in between each site call, to slow the xml-rpc requests down.
2011-06-10 21:17:34 -07:00
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
0ae022d688
Decreased timeout of HG StatusNotification to 4secs. http://opensimulator.org/mantis/view.php?id=5516
2011-06-10 20:59:57 -07:00
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
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
39e878eb8f
Align CenomeCache.ini.example values with CenomeCache defaults.
2011-06-11 00:35:31 +01:00
c7cef650db
Make it clear that WaitOnInprogressTimeout is currently a dead setting in FlotsamCache.ini.example
2011-06-11 00:10:40 +01:00
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
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
c7bdb66a1f
Added missing "Old Guids=true" to ConnectionString
2011-06-10 21:10:37 +01:00
804fe2d9b0
Save the sun's position in OARs
2011-06-10 20:55:58 +01:00
Dan Lake