ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-24 10:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,641 Commits 5 Branches 93 Tags
df7abbb367ecac2fb09e1af10d3ec2a792ea2ed2
Commit Graph

269 Commits

Author SHA1 Message Date
Melanie
31ab8b2fe0 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-05-05 10:32:04 +01:00
Justin Clark-Casey (justincc)
231a3bf147 Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable. 
This is most useful for capabilities where the url is not self-describing.
 2012-05-03 01:45:49 +01:00
Melanie
44f1f87656 Merge branch 'master' into careminster 2012-03-25 20:07:43 +01:00
Justin Clark-Casey (justincc)
4f17537555 Allow the user to enter help topics in upper or lowercase. 
Forcing uppercase (e.g. help Assets) is too annoying.
Thanks to WhiteStar for pointing this out.
 2012-03-24 03:07:01 +00:00
Melanie
2190a62366 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-23 02:44:22 +00:00
Justin Clark-Casey (justincc)
18b3f1132e Rename Scene.StartTimer() to Start() - this method no longer uses a timer. Comment out more effectively unused old heartbeat code. 2012-03-23 01:21:43 +00:00
Melanie
f292e19689 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
 2012-03-11 02:29:43 +00:00
Justin Clark-Casey (justincc)
d6ebf2d6ca Add ability to specify a default estate to be used when creating regions. 
This is configured in the new [Estates] section of OpenSim.ini.
If a default estate is configured then all new regions are automatically joined to it instead of asking the user.
If the default estate does not already exist then it is created.
Current default behaviour remains the same - the user is asked for estate details when necessary.
Thanks to Frenando Oliveira for the patch which I adapated further.
 2012-03-10 01:27:05 +00:00
Melanie
b0fc96c17d Merge branch 'master' into careminster 2012-03-08 19:10:22 +00:00
Justin Clark-Casey (justincc)
650d761c06 Display help commander topics in capitalized form - the commands themselves are still lowercase. 
Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
 2012-03-08 02:17:45 +00:00
Justin Clark-Casey (justincc)
749c3fef8a Change "help" to display categories/module list then "help <category/module>" to display commands in a category. 
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
 2012-03-08 01:51:37 +00:00
Melanie
1b63b21a4d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
 2012-01-31 20:53:49 +00:00
Melanie
d2dfa4cfe7 Make parcel sale overlays work. No auction support. 2012-01-31 03:09:44 +00:00
Melanie
71012ef883 Make parcel sale overlays work. No auction support. 2012-01-31 02:19:34 +01:00
Melanie
427ab55058 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
 2012-01-25 00:45:57 +00:00
Justin Clark-Casey (justincc)
2d0412d366 Make errors reported by OpenSim when it halts because it can't find certain config sections or files a bit more user friendly. 2012-01-24 22:35:55 +00:00
Melanie
b970d4f976 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-12-22 16:37:25 +00:00
Dan Lake
41b02a7208 Remove unused SetAcceleration and add set on Acceleration parameter 2011-12-20 14:45:32 -08:00
Melanie
50aa89dae6 Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-12-08 03:24:25 +00:00
BlueWall
33c6067098 Trigger a Jenkins build 2011-12-07 11:21:50 -05:00
Justin Clark-Casey (justincc)
4567555c49 Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse. 
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
 2011-12-05 20:44:20 +00:00
Melanie
bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +00:00
Melanie
a8270cb48c Merge branch 'master' into bigmerge 2011-11-24 01:16:37 +00:00
BlueWall
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
Melanie
353f0c0e03 Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-10-25 02:14:39 +01:00
Melanie
f50538c81a Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2011-10-25 01:55:01 +01:00
Justin Clark-Casey (justincc)
ddf54b5537 move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others 2011-10-15 03:03:05 +01:00
Justin Clark-Casey (justincc)
528cc8136e fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params 2011-10-15 02:54:43 +01:00
Melanie
b251423b11 Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge 2011-10-12 07:04:28 +01:00
Melanie
77f9d98831 Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge 2011-10-12 01:41:59 +01:00
Melanie
6af388ded9 Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge 2011-10-12 01:30:14 +01:00
Melanie
f1fa059b37 Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge 2011-10-11 21:32:24 +01:00
Melanie
986a3838a6 Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge 2011-10-11 21:29:58 +01:00
Melanie
5b40389352 Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge 2011-10-11 21:29:04 +01:00
Melanie
8fac7c0650 Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
 2011-10-11 21:28:23 +01:00
Justin Clark-Casey (justincc)
1f78dc6504 remove the pointless slashes on the end of the (5!) different server stat retrieval mechanisms. 
Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/
Can't do this with webstats yet since it does insane things to the path.
 2011-10-07 00:30:35 +01:00
Justin Clark-Casey (justincc)
8a8983b3d4 Add user ID to new estate user prompt, to make it clearer and consistent with the main create user prompts 2011-10-05 23:34:18 +01:00
Justin Clark-Casey (justincc)
b907a66f39 When creating a new user on the comand line, give the option of allowing a UUID to be specified to override the randomly generated one. 
This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership.
 2011-10-04 23:48:35 +01:00
justincc
a00327d0e5 Fix build errors on Windows by adding missing OpenSim.Services.Base reference 2011-09-16 19:54:23 +01:00
Justin Clark-Casey (justincc)
9046651583 Pass any region scope through to the CreateUser() method 2011-09-16 00:36:43 +01:00
Justin Clark-Casey (justincc)
4ae4b14b5d refactor: move estate owner setup code into separate method 2011-09-16 00:24:23 +01:00
Justin Clark-Casey (justincc)
522d6261f1 Correctly create a freshly created estate owner's default items and avatar entries on standalone if applicable. 2011-09-16 00:12:12 +01:00
Tom
5484c9b585 Bring us up to date. 2011-09-14 19:11:32 -07:00
Oren Hurvitz
1dd904b78e Delay loading scripts until the scene has finished loading 2011-09-09 23:01:05 +01:00
Melanie
5c012cac54 Add a timer to monitor the heartbeat. Restart it if it's been dead for 
5 seconds.
 2011-07-25 04:16:53 +02:00
Melanie
326c46ba70 Merge branch 'master' into careminster-presence-refactor 2011-06-09 02:05:04 +01:00
Oren Hurvitz
61f1c2b2c5 Write estate errors on startup to the log 2011-06-07 20:20:04 -07:00
Justin Clark-Casey (justincc)
8f4bf43534 When asked to join region to existing estate, make first estate name the default instead of None 2011-04-01 00:55:05 +01:00
Justin Clark-Casey (justincc)
e1ceb461c0 Make default answer for 'do you wish to join region to an existing estate' yes instead of no. 2011-04-01 00:51:10 +01:00
Melanie
a62b435a39 Merge branch 'master' into careminster-presence-refactor 2011-03-27 21:41:54 +01:00