bf283208df
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
7b0b5c9d97
Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
2013-07-28 13:49:58 -07:00
9cbbb7eddf
Clarification on docs of .ini.examples for Groups (again)
2013-07-27 19:16:48 -07:00
1572e91b5f
Clarifications on documentation of Group configs
2013-07-27 08:04:48 -07:00
7914eaa357
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSimDefaults.ini
2013-07-25 16:55:23 +01:00
e103e34f1d
Added config var that we all thought was already there: see_into_region. (Note: different from the defunct see_into_neighboring_sim, which used to control the process from the other end). This enables child agents in neighbors for which the root agent doesn't have permission to be in.
2013-07-24 11:25:41 -07:00
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
7830cc9954
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
9432f3c94d
Improvements to the ServiceThrottleModule: added a category and an itemid to the interface, so that duplicate requests aren't enqueued more than once.
2013-07-16 19:04:30 -07:00
d48946f9ef
Document obscure Groups config related to the user level required for creating groups
2013-07-14 16:51:07 -07:00
a65cec3986
BulletSim: implementation of linkset center-of-mass.
...
Default off, for the moment, until more testing.
Add separate thread and center-of-mass flags to OpenSimDefaults.ini.
Clean up comments in OpenSimDefaults.ini.
2013-07-06 08:25:15 -07:00
f2f33b7577
Some consistency fixes for the ini to stop parser breakage
2013-07-04 17:45:17 -04:00
ffcee82b1d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2013-06-30 18:27:30 +01:00
4406f07a84
Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars.
...
This makes stars appear more realistically rather than as massive chunks due to the missing IMG_BLOOM1 asset from the viewer.
Thanks to YoshikoFazuku for supplying the star asset which I then uploaded via a viewer and extracted as JPEG2000.
Thanks also to Ai Austin for helping this process along.
See http://opensimulator.org/mantis/view.php?id=6691 for more details.
2013-06-28 23:34:16 +01:00
56f4adeb60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00
b2c8d5eec7
Add Option: ClassifiedFee
...
Add option to set minimum fee for publishing classifieds. Many viewers have a
hard coded minimum of 50, which makes publishing classifieds fail where grids
have no economy. This allows the grid to set the minimum fee to a suitable
value for their operation.
The option is located in the [LoginService] section and defaults to 0. The
value is sent as "classified_fee" in the login response.
2013-06-13 09:18:27 -04:00
9fec0faade
Revert "Add option to set minimum fee for classified ads"
...
This reverts commit 90097de6c3
2013-06-11 21:46:40 -04:00
90097de6c3
Add option to set minimum fee for classified ads
...
Upcoming phoenix-firestorm (4.4.1) adds a configurable option for setting
the minimum price for publishing a classified ad.
http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/43415d69b048
2013-06-11 20:35:25 -04:00
fe4a67efb6
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
02548bdc16
Update HTTP server
2013-06-04 21:11:16 +01:00
648e258b8e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
43d804b998
New HttpServer_OpenSim.dll with increased limits on number of connections, requests, etc.
2013-06-04 12:27:22 -07:00
ba2f13db63
Adding back the BasicProfileModule
2013-05-31 21:19:15 -04:00
924a5df25f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-30 19:20:36 -07:00
3aa2fb9928
BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini and
...
replace with things someone might actually want to tune (avatar height, ...).
2013-05-30 19:16:29 -07:00
328883700a
UserProfiles
...
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
2013-05-30 17:59:18 -04:00
669fa3ff9a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2013-05-30 21:48:09 +01:00
0c35d28933
BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs
...
which recompute GImpact shape bounding box after creation as Bullet
doesn't do that itself (something it does for nearly every other shape).
Now, physical prims without cuts become single mesh convex meshes. Physical
prims with cuts become GImpact meshes. Meshes become a set of convex
hulls approximated from the mesh unless the hulls are specified in the
mesh asset data. The use of GImpact shapes should make some mechanical
physics more stable.
2013-05-26 17:35:12 -07:00
09c2cd0d76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-05-24 00:45:08 +01:00
10097f13aa
BulletSim: update DLLs and SOs with version containing gImpact code.
2013-05-21 21:40:26 -07:00
42c82b564e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2013-05-16 21:59:14 +01:00
71a5cc2041
Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686b
2013-05-16 00:07:55 +02:00
12289c4fd1
Removed obsolete libopenmetaverse file
2013-05-16 00:02:28 +02:00
13cd8c17d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2013-05-11 02:35:26 +01:00
182ea00cb3
Application support:
...
Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
2013-05-09 10:50:18 -04:00
cdaceea5a6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-05-08 21:51:48 +01:00
33aaa40bee
Adds an event and a method so that handling of the CachedTexture
...
packet can be pulled out of LLClientView and moved to
AvatarFactory. The first pass at reusing textures (turned off by
default) is included. When reusing textures, if the baked textures
from a previous login are still in the asset service (which generally
means that they are in the simulator's cache) then the avatar will not
need to rebake. This is both a performance improvement (specifically
that an avatars baked textures do not need to be sent to other users
who have the old textures cached) and a resource improvement (don't
have to deal with duplicate bakes in the asset service cache).
2013-05-08 13:13:51 -07:00
bda4565067
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2013-05-08 20:59:44 +01:00
601aa91163
Delete "" entry for AvatarPicker cap.
2013-05-07 19:16:42 -07:00
e92c05ebbd
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
3aa83738e2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-05-04 01:22:12 +01:00
4cb73192a7
Make default config directory "."
2013-05-01 23:01:33 -04:00
8c5445b774
Merge branch 'master' into careminster
...
Conflicts:
ThirdParty/SmartThreadPool/SmartThreadPool.cs
2013-05-01 21:39:49 +01:00
8d3250cee4
Add information about creating a PID file for robust to the Robust.ini and Robust.HG.ini example files
2013-05-01 19:15:05 +01:00
d36a52ea55
Merge branch 'master' into careminster
2013-04-25 00:22:28 +01:00
1593d795ea
BulletSim: version of libBulletSim.so for 32 bit systems that doesn't
...
crash on startup. Doesn't yet solve the new glibcxx dependencies.
2013-04-24 15:01:11 -07:00
e324f6f3f0
BulletSim: update DLLs and SOs to they have no dependencies on newer
...
glibc (2.14) since that is not yet in some Linux distributions.
Add unmanaged API calls and code for creating single convex hull shapes.
2013-04-24 08:03:45 -07:00
ed22014646
revert CSJ2K.dll to version in use prior to commit d4fa2c69ed
2013-04-23 15:01:20 -07:00
8b57ee4fd1
Merge branch 'master' into careminster
2013-04-22 22:38:58 +01:00
3e818eaeb5
Add the enter uuid dialog
2013-04-22 22:58:33 +02:00
671a97ef76
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-04-22 22:28:41 +02:00
a7a92e7339
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-04-22 22:26:04 +02:00
4aa6f2bbba
Add the set object owner floater template
2013-04-22 22:23:42 +02:00
6ddc39a676
Clean up unused config and config comments.
2013-04-21 16:56:18 -07:00
231c298ca5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
bin/OpenMetaverse.StructuredData.XML
bin/OpenMetaverse.XML
bin/OpenMetaverseTypes.XML
2013-04-21 14:11:39 +01:00
855c88a9c0
Fix spelling
2013-04-20 11:57:11 -04:00
d4fa2c69ed
update libomv to git master which adds support for MaterialID in TextureEntry
2013-04-17 21:31:18 -07:00
7cf377fff0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-04-10 13:20:55 +01:00
59135c9a31
BulletSim: add Bullet HACD library invocation. Turned off by default as not
...
totally debugged. Updated DLLs and SOs with more debugged HACD library code.
2013-04-09 18:00:23 -07:00
659c741ff5
Add more notes to async_call_method relating to UnsafeQueueUserWorkItem
...
UnsafeQueueUserWorkItem is so called because it allows the calling code to escalate its security privileges.
However, since we must already trust this code anyway in OpenSimulator this is not an issue.
2013-04-09 23:15:01 +01:00
4d2203ff52
BulletSim: Add dylib for BulletSim and add he who figured out building BulletSim
...
on a Mac to the CONTRIBUTORS file.
2013-04-08 09:15:20 -07:00
f68b963596
fixed bullet config for osx
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-04-08 09:09:30 -07:00
41a652f6bd
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-04-02 23:47:19 +01:00
17aef1c883
BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD
...
mesh to hull conversion calls in place but code not working. Update
BulletSim DLLs and SOs for new API and HACD code.
2013-04-01 18:03:11 -07:00
5b950ca36a
Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster
2013-03-19 00:54:23 +00:00
6e1b3f9951
*Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
2013-03-16 03:14:11 -04:00
8b657773e4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2013-03-14 22:34:15 +00:00
9fad90a914
Merge branch 'master' of ssh://opensim/var/git/opensim
2013-03-14 00:58:00 -04:00
42c533c589
* Updates HttpServer again to re-add the code that closes the stream and connection when It's done sending. Be on the lookout for an old linux/mono bug where the client doesn't get the last bit of the stream before it is disconnected!. Code on opensim-libs. All tests pass.. HttpServer's internal tests pass.. but just a bad feeling. More people should test :)
2013-03-14 00:57:42 -04:00
710381e838
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
2013-03-13 02:02:46 +00:00
fb1211ad5e
Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section of OpenSim.ini. False by default.
...
This option allows the simulator to specify that the cancel button on inter-region teleports should never appear.
This exists because sometimes cancellation will result in a stuck avatar requiring relog.
It may be hard to prevent this due to the protocol design (the LL grid has the same issue)
In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
2013-03-12 23:01:27 +00:00
1e7c7fb779
Merge branch 'master' into careminster
2013-03-11 19:09:49 +00:00
13f3bcae94
Update comment about setting physics=BulletSimN as the C# Bullet
...
version has been wrapped into one BulletSim and the physics engine
selection is now done as specified in OpenSimDefaults.ini.
2013-03-10 22:24:34 -07:00
70f0587558
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-08 01:07:05 +00:00
2f1aa87eb5
One more comment inconsistency fixed.
2013-03-07 08:02:48 -08:00
fdebee25db
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-07 06:41:03 -08:00
2b0056eaca
Fixed inconsistency in comments. Thanks Ai Austin.
2013-03-07 06:40:39 -08:00
81552f41c6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-05 23:57:53 +00:00
7556b42d7a
* Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9
...
* Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter.. which adds up the Length property all of the blocks.
2013-03-04 21:26:26 -05:00
aadf7d32d1
GridUserService was missing from [Gatekeeper]
2013-03-04 12:52:28 -08:00
b47ffb5dc4
Added existance and default value for [XEngine]MinTimerInterval to OpenSimDefaults.ini
2013-03-02 13:02:02 -08:00
1bc8692a99
Move AllowedClients and BannedClients section to new [AccessControl] section in OpenSim.ini from [Startup]
...
This change also corrects the setting names - they were actually wrong (though the text in {} was correct).
If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
2013-03-02 01:43:54 +00:00
4999d7920a
Revert "Removed more vars from [Startup]. I think these were already moved elsewhere, because I can't find any reference to them in the code."
...
This reverts commit efa7227865
2013-03-02 01:23:01 +00:00
a675f7d4c3
Merge branch 'master' into careminster
2013-03-01 23:54:00 +00:00
20530ee667
Moved permissions config vars out of [Startup] into [Permissions]. Backwards compatible ([Startup] still being looked up), but please update your configs sometime soon.
2013-03-01 15:24:22 -08:00
efa7227865
Removed more vars from [Startup]. I think these were already moved elsewhere, because I can't find any reference to them in the code.
2013-03-01 14:18:01 -08:00
eb9458fd7e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2013-02-28 21:20:07 +00:00
9e0c678c1e
Robust.HG.ini.example updated to get an [Hypergrid] section too.
2013-02-28 06:24:09 -08:00
64b8ce73da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-27 20:50:03 -08:00
f1010d7b15
Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
2013-02-27 20:49:41 -08:00
1bef19b914
Do not have the Freeswitch connector on by default in Robust ini example files.
...
This is not widely used (may even be currently broken), only allows very poor quality voice (not the fault of FreeSwitch)
and requires a complicated Freeswitch setup.
Having it on but not configured results in spurious warnings in the logs
2013-02-27 21:45:31 +00:00
578174d21c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-02-27 18:05:04 +00:00
20760fde25
Improve description of GenerateMapTiles config option
2013-02-27 00:31:54 +00:00
917c1695a1
Add documentation on default or Warp3D image module choice to OpenSim.ini.example.
...
As before, default is MapImageModule.
Thanks to Ai Austin for pointing out this omission.
2013-02-27 00:27:21 +00:00
54ee95dd8e
Merge branch 'master' into careminster
2013-02-26 13:34:20 +00:00
d0cb4fc326
Move map related settings from [Startup] to a new [Map] section in OpenSim.ini
...
Existing map settings in [Startup] will continue to work, and if present will override anything in [Map]
However, the proper place for such settings would now be [Map]
This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings.
This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
2013-02-25 23:04:38 +00:00
53470d5057
Missing var in [LoginService] for HG Robust.
2013-02-25 10:25:36 -08:00
e3ea2c4bee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-02-23 20:37:09 +00:00
6a01683aeb
More clarification on the [Groups] section
2013-02-23 11:24:11 -08:00
a0161e7161
Further clarification on the same spot.
2013-02-23 11:21:14 -08:00
Melanie