Melanie
b60ff651a3
Merge branch 'master' into bigmerge
2011-12-01 12:16:59 +00:00
Justin Clark-Casey (justincc)
fa63054c4f
On "show caps", stop excluding the seed cap but do exclude it elsewhere
2011-11-29 20:37:03 +00:00
Justin Clark-Casey (justincc)
d3a46b03bf
tabulate "show caps" output for easier readability
2011-11-29 16:29:11 +00:00
Melanie
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc)
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
Melanie
b451cc1ebb
Merge branch 'master' into careminster-presence-refactor
2011-05-08 20:23:06 +01:00
Justin Clark-Casey (justincc)
2ef8e03773
Change command help text for "show capabilities" to "show caps", as this is the actual command that has to be typed on the console.
...
Thanks to makopoppo for the patch - http://opensimulator.org/mantis/view.php?id=5467
2011-05-06 21:21:02 +01:00
Melanie
4beb0c9b9b
Merge branch 'master' into careminster-presence-refactor
2011-05-05 09:49:10 +01:00
Diva Canto
98b84802e4
Changed the defaults, so that it behaves exactly is it has been behaving (no WebFetch cap by default).
2011-05-02 20:19:36 -07:00
Diva Canto
f79400e94c
Broke down Caps.cs into a generic Caps object that simply registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps.
...
Renamed a few methods that were misnomers.
Compiles but doesn't work.
2011-05-01 18:22:53 -07:00
Diva Canto
126d2adeba
Move CapabilitiesModule back to CoreModules. This one belongs there.
2011-05-01 12:02:07 -07:00
