From 91cc09b7bf5dd876a74413855b75a1197e3813e4 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 20 Mar 2012 21:36:24 -0700 Subject: HG Friends config for Robust.HG.ini.example --- bin/Robust.HG.ini.example | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index db9f08b..e0242ab 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -395,8 +395,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 HomeURI = "http://127.0.0.1:8002" [HGFriendsService] - LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService" - UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService" + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" + UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + GridService = "OpenSim.Services.GridService.dll:GridService" + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" [HGInstantMessageService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" -- cgit v1.1 From 06c81a2afe4d3c4060863cbb7736776ebf77bfba Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 21 Mar 2012 20:31:51 -0400 Subject: Fix typo Add enclosing " to urls --- bin/Robust.ini.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 326caeb..69e94a5 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -225,10 +225,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 MapTileURL = "http://127.0.0.1:8002"; ; For V2/3 Web Profiles - ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME] + ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" ; For V2/V3 webapp authentication SSO - OpenIDServerURL = "http://127.0.0.1/openid/openidserver/ + OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" ; If you run this login server behind a proxy, set this to true ; HasProxy = false -- cgit v1.1 From 6146e7ef258b10888ad7464b72b75cca701e02c9 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 22 Mar 2012 12:57:12 -0700 Subject: Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch. --- bin/OpenSim.ini.example | 8 ++++++++ bin/OpenSimDefaults.ini | 7 +++++++ 2 files changed, 15 insertions(+) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 2c85f9d..01dc1d6 100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -194,6 +194,14 @@ ; region_manager_is_god = false ; parcel_owner_is_god = true + ;; More control over permissions + ;; This is definitely not SL! + ; Provides a simple control for land owners to give build rights to specific avatars + ; in publicly accessible parcels that disallow object creation in general. + ; Owners specific avatars by adding them to the Access List of the parcel + ; without having to use the Groups feature + ; simple_build_permissions = false + ;; Default script engine to use. Currently, we only have XEngine ; DefaultScriptEngine = "XEngine" diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index fd31131..1a0d801 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -260,6 +260,13 @@ ; Default value is all ; allowed_script_editors = all + ; Provides a simple control for land owners to give build rights to + ; publicly accessible parcels that disallow object creation in general. + ; Owners specific avatars by adding them to the Access List of the parcel + ; without having to use the Groups feature + ; Disabled by default + ; simple_build_permissions = False + ; ## ; ## SCRIPT ENGINE ; ## -- cgit v1.1 From 45b588cf008c514f461bf43c168dcdc9902b7bb9 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 22 Mar 2012 20:10:38 +0000 Subject: Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch." This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9. --- bin/OpenSim.ini.example | 8 -------- bin/OpenSimDefaults.ini | 7 ------- 2 files changed, 15 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 01dc1d6..2c85f9d 100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -194,14 +194,6 @@ ; region_manager_is_god = false ; parcel_owner_is_god = true - ;; More control over permissions - ;; This is definitely not SL! - ; Provides a simple control for land owners to give build rights to specific avatars - ; in publicly accessible parcels that disallow object creation in general. - ; Owners specific avatars by adding them to the Access List of the parcel - ; without having to use the Groups feature - ; simple_build_permissions = false - ;; Default script engine to use. Currently, we only have XEngine ; DefaultScriptEngine = "XEngine" diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 1a0d801..fd31131 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -260,13 +260,6 @@ ; Default value is all ; allowed_script_editors = all - ; Provides a simple control for land owners to give build rights to - ; publicly accessible parcels that disallow object creation in general. - ; Owners specific avatars by adding them to the Access List of the parcel - ; without having to use the Groups feature - ; Disabled by default - ; simple_build_permissions = False - ; ## ; ## SCRIPT ENGINE ; ## -- cgit v1.1 From 25e5b6a76c4cc517306d25a692e1c147507238f0 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 22 Mar 2012 14:21:07 -0700 Subject: Added new simple_build_permissions config to the .ini and .example files. --- bin/OpenSim.ini.example | 9 +++++++++ bin/OpenSimDefaults.ini | 8 ++++++++ 2 files changed, 17 insertions(+) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 2c85f9d..50366a6 100755 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -194,6 +194,15 @@ ; region_manager_is_god = false ; parcel_owner_is_god = true + ;; More control over permissions + ;; This is definitely not SL! + ; Provides a simple control for land owners to give build rights to specific avatars + ; in publicly accessible parcels that disallow object creation in general. + ; Owners specific avatars by adding them to the Access List of the parcel + ; without having to use the Groups feature + ; simple_build_permissions = false + + ;; Default script engine to use. Currently, we only have XEngine ; DefaultScriptEngine = "XEngine" diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index fd31131..3470b82 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -260,6 +260,14 @@ ; Default value is all ; allowed_script_editors = all + ; Provides a simple control for land owners to give build rights to specific avatars + ; in publicly accessible parcels that disallow object creation in general. + ; Owners specific avatars by adding them to the Access List of the parcel + ; without having to use the Groups feature + ; Disabled by default + ; simple_build_permissions = False + + ; ## ; ## SCRIPT ENGINE ; ## -- cgit v1.1