From 3e71c71cbffb0de454759e2bbd0ff840dfa480bc Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 3 Oct 2012 16:07:11 -0400 Subject: Add modular configuration for Robust connectors We can provide modular ini for connectors... look for our configuration in the following places... 1) in the default ini/-inifile 2) in the named file (ConfigName) located in the configured directory (see Robust[.HG].ini [Start] section for ConfigDirectory) 3) in the repository named in the connector (ConfigURL) In this case, the file will be written into the configured directory with the specified See example connector/service @ https://github.com/BlueWall/SlipStream for testing. --- bin/Robust.HG.ini.example | 4 ++++ bin/Robust.ini.example | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 18094b7..995f181 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -23,6 +23,10 @@ [Startup] ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector,8002/OpenSim.Server.Handlers.dll:HGFriendsServerConnector,8002/OpenSim.Server.Handlers.dll:InstantMessageServerConnector,8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector,8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector" +; Modular configurations +; Set path to directory for modular ini files... +ConfigDirectory = "/home/opensim/etc/Configs" + ; * This is common for all services, it's the network setup for the entire ; * server instance, if none is specified above ; * diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 5a9d613..7b8e83d 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -15,6 +15,11 @@ [Startup] ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector,8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector" + +; Modular configurations +; Set path to directory for modular ini files... +ConfigDirectory = "/home/opensim/etc/Configs" + ; * This is common for all services, it's the network setup for the entire ; * server instance, if none is specified above ; * -- cgit v1.1 From 227cfbdc67dd96adcf6fba592fba8811c6fad152 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 3 Oct 2012 19:48:54 -0400 Subject: Update Mono.Addins Update Mono.Addins to latest - 3177b22e958c82bf2c5655ac3d4ef7ad25cc2588 --- bin/Mono.Addins.CecilReflector.dll | Bin 364032 -> 226816 bytes bin/Mono.Addins.Setup.dll | Bin 103424 -> 130560 bytes bin/Mono.Addins.dll | Bin 202752 -> 235008 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll index a1a6382..fb95e00 100755 Binary files a/bin/Mono.Addins.CecilReflector.dll and b/bin/Mono.Addins.CecilReflector.dll differ diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll index 8aa6d5f..502ad18 100755 Binary files a/bin/Mono.Addins.Setup.dll and b/bin/Mono.Addins.Setup.dll differ diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll index ea330fd..1bc4c55 100755 Binary files a/bin/Mono.Addins.dll and b/bin/Mono.Addins.dll differ -- cgit v1.1 From 741471e02cecdd70db90954aa8e4e47ac2627d9a Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 3 Oct 2012 21:49:58 -0400 Subject: Remove duplicate files We are keeping these in bin/lib(32/64) now --- bin/openjpeg-dotnet-x86_64.dll | Bin 215040 -> 0 bytes bin/openjpeg-dotnet.dll | Bin 201216 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100755 bin/openjpeg-dotnet-x86_64.dll delete mode 100755 bin/openjpeg-dotnet.dll (limited to 'bin') diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll deleted file mode 100755 index 9e8cd21..0000000 Binary files a/bin/openjpeg-dotnet-x86_64.dll and /dev/null differ diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll deleted file mode 100755 index 6377b8d..0000000 Binary files a/bin/openjpeg-dotnet.dll and /dev/null differ -- cgit v1.1 From 440726250cc2a523463f575b682a6ddb6242408c Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sat, 6 Oct 2012 11:48:21 -0400 Subject: Added parts to manage repositories and plugin management This is working - more testing to follow, then soem documentation --- bin/Robust.HG.ini.example | 8 ++++++++ bin/Robust.ini.example | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 995f181..107a42d 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -23,8 +23,16 @@ [Startup] ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector,8002/OpenSim.Server.Handlers.dll:HGFriendsServerConnector,8002/OpenSim.Server.Handlers.dll:InstantMessageServerConnector,8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector,8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector" +; Plugin Registry Location +; Set path to directory for plugin registry. Information +; about the registered repositories and installed plugins +; will be stored here +; The Robust.exe process must hvae R/W access to the location +RegistryLocation = "." + ; Modular configurations ; Set path to directory for modular ini files... +; The Robust.exe process must hvae R/W access to the location ConfigDirectory = "/home/opensim/etc/Configs" ; * This is common for all services, it's the network setup for the entire diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 7b8e83d..430be26 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -15,9 +15,17 @@ [Startup] ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector,8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector" +; Plugin Registry Location +; Set path to directory for plugin registry. Information +; about the registered repositories and installed plugins +; will be stored here +; The Robust.exe process must hvae R/W access to the location +RegistryLocation = "." + ; Modular configurations ; Set path to directory for modular ini files... +; The Robust.exe process must hvae R/W access to the location ConfigDirectory = "/home/opensim/etc/Configs" ; * This is common for all services, it's the network setup for the entire -- cgit v1.1 From 16d18afe21fdafe19f2f0be9803834626f4c20b7 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 7 Dec 2012 12:38:19 -0800 Subject: Added missing config var in grided sims. --- bin/config-include/GridCommon.ini.example | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bin') diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 79f7ed6..e53fcca 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -137,6 +137,11 @@ ;; uncomment the next line. You may want to do this on sims that have licensed content. ; OutboundPermission = False + ;; Send visual reminder to local users that their inventories are unavailable while they are traveling + ;; and available when they return. True by default. + ;RestrictInventoryAccessAbroad = True + + [HGAssetService] ; ; === HG ONLY === -- cgit v1.1 From bd14fa15e4fa175e8cb216a00eee7f4a7d9d6ba3 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sat, 8 Dec 2012 17:15:35 -0500 Subject: Add back openjpeg dll for Windows May generate some error output during startup on Robust - ignore for now, will fix soon. --- bin/openjpeg-dotnet-x86_64.dll | Bin 0 -> 215040 bytes bin/openjpeg-dotnet.dll | Bin 0 -> 201216 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 bin/openjpeg-dotnet-x86_64.dll create mode 100755 bin/openjpeg-dotnet.dll (limited to 'bin') diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll new file mode 100755 index 0000000..9e8cd21 Binary files /dev/null and b/bin/openjpeg-dotnet-x86_64.dll differ diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll new file mode 100755 index 0000000..6377b8d Binary files /dev/null and b/bin/openjpeg-dotnet.dll differ -- cgit v1.1