898549d13e
Merge branch 'master' into careminster
2011-12-14 08:57:55 +00:00
3a06640730
Get rid of the 'lolcat' library asset.
...
This was both unused and an invalid jpeg2000 texture from way back in 2008
2011-12-12 21:17:01 +00:00
e9b59e7627
Remove long unused libdb_dotNET43.dll
2011-12-12 19:31:12 +00:00
f025387f10
Set adaptive throttles false by default because it doesn't play nice with AVN
...
code
2011-12-09 19:56:03 +01:00
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
fd023b317a
Update libomv to 0.9.1
2011-12-07 09:56:15 -05:00
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
6541fc08d4
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 22:46:37 -05:00
e26ef8aeca
change misleading login = http://127.0.0.1:9000/ in GridInfoService in Robust.ini.example to 8002
2011-12-03 02:48:16 +00:00
e7930b1d0f
Make fix to Nini for null references in some cases.
2011-11-29 22:25:03 -05:00
dc612d0f08
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-11-28 11:06:38 +00:00
676d32974a
Implement the FetchInventoryDescendents2 capability using the same code as WebFetchInventoryDescendents.
...
Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
2011-11-25 22:46:42 +00:00
b785f204ce
remove some mono compiler warnings
2011-11-25 22:19:57 +00:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
d4e3a7fe81
Shell Environment Variables in config
...
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration.
Nini @ https://github.com/BlueWall/Nini-Dev
2011-11-23 10:11:47 -05:00
a94ce3f1df
Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in OpenSim.ini.example.
...
If anybody was changing this and wondering why there was no effect, this is why.
2011-11-21 15:30:00 +00:00
bdb5ac96d9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-11-19 22:39:15 +00:00
21353de9b7
Enable v2/v3 map tile url setting on robust as default in config
...
This is necessary to see map tiles on v2/v3 viewers and appears to work fine
2011-11-19 00:34:56 +00:00
f72c4bdba5
Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.
...
This will hopefully address mantis 5471, 5694 and 5718.
This code is now in opensim-libs, along with Diva's slightly older patches (which were already applied to the DLLs in the opensim tree).
Thanks Oren!
2011-11-18 22:52:59 +00:00
9d458fdd7f
Turn the [RegionReady] module on by default and login_disable = true while scripts are loading.
...
From field experience, we know that simulators can be unstable if a user logs in before the scripts have finished loading.
This commit turns login_disable = true in [RegionReady] on by default which prevents this from happening.
If you want the old behaviour, please copy these section from OpenSimDefaults.ini into OpenSim.ini and set login_disable = false
2011-11-18 21:31:23 +00:00
169387b390
Turn SellEnabled in the [EconomyModule] on by default.
...
This only provides enough functionality to allow operations for no money (e.g. sell for $0).
2011-11-17 23:53:25 +00:00
2d4ac6288d
Alter commit 3758306 to allow region name to be substituted within a region console prompt
...
This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash)
e.g. "Region (\R) " is the current and continuing default prompt
This renames custom_prompt in [Startup] to ConsolePrompt
2011-11-10 22:56:13 +00:00
4939d99b57
Merge branch 'master' into bigmerge
2011-11-10 23:03:50 +00:00
a1426739a2
Merge branch 'master' into bigmerge
2011-11-10 17:35:35 +00:00
37583063ee
Allow custom setting for the console prompt
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-11-10 06:56:32 -05:00
facdc9c46e
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 22:56:08 +00:00
4d3926694d
Remove enableprejump config option and associated code as this is now
...
fully functional and cannot be disabled because that would break timings.
2011-11-05 22:43:45 +00:00
24235006f4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
59232a6ea8
Change default say distance to 20m from 30m, the same as on the big grid. This is to improve the migration of scripts that expect a 20m say distance.
...
If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
2011-11-02 20:05:31 +00:00
b69f679122
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2011-11-01 23:54:09 +00:00
4b58d4ff95
Removed see_into_this_sim_from_neighbor configuration option.
2011-11-01 16:51:14 -07:00
74cc834fec
Remove unused PumaCode.SvnDotNet library
2011-10-31 21:37:35 +00:00
083b28de8c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-30 10:16:25 +00:00
9bdf118e0d
Add missing max_listens_per_region to [LL_Functions] config section in OpenSimDefaults.ini + explanation.
...
This setting controls the maximum number of listeners in a region
2011-10-29 02:45:50 +01:00
6a96c9546d
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-26 17:48:51 +01:00
41395d5443
Added optional owner classes to existing OSSL agent Permissions
...
PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 10:35:50 -04:00
740077a291
Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge
2011-10-25 03:26:20 +01:00
4e9457ca0c
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
...
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
2011-10-25 03:26:09 +01:00
508f2ebb76
Merge commit '655aee44c4236d7023b9274645bf033b87b17131' into bigmerge
2011-10-25 03:19:30 +01:00
98b7bd01cb
Merge commit '229ca09b7956f51fc2618dc35dff87cf04bf0fc9' into bigmerge
2011-10-25 03:19:16 +01:00
a71c60ee6d
Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge
2011-10-25 02:56:56 +01:00
cdca0fb387
Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge
2011-10-25 02:56:03 +01:00
f5e2bdebef
Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge
2011-10-25 02:55:57 +01:00
90f17785c3
Merge commit '352002fd0b74a87f62ea82c76969e4110ba2542f' into bigmerge
2011-10-25 02:54:53 +01:00
8841b77cd1
Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge
2011-10-25 01:53:53 +01:00
3eb51e9a79
Merge commit 'bea65b06a445c267ecb77be08452146cb7fee1ce' into bigmerge
2011-10-25 01:52:12 +01:00
2d4ba1a871
Merge commit '03102864f0d9851b6937ca5472f48f10ec861a26' into bigmerge
2011-10-25 01:52:00 +01:00
b4395143e7
Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 01:50:07 +01:00
Melanie