Commit Graph

11 Commits

Author SHA1 Message Date
UbitUmarov
582dc75381 remove a accent from a method name 2017-05-27 06:30:23 +01:00
UbitUmarov
254b26a7d5 fix merge 2017-01-05 19:32:57 +00:00
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
18a292ad02 Merge branch 'master' into httptests 2016-12-14 13:35:53 +00:00
UbitUmarov
364d58635b avoid a null ref 2016-12-14 03:02:57 +00:00
UbitUmarov
93ea7bd7f4 Merge branch 'master' into httptests 2016-11-07 11:36:43 +00:00
UbitUmarov
6bc76860d1 avoid a null ref, few changes to udp updates send 2016-11-05 23:56:55 +00:00
UbitUmarov
80d4f76d18 keep a unsecure http port up for external services (datasnapshot search). Only fire poolservices on main http listener 2016-10-09 20:18:20 +01:00
UbitUmarov
23578635df more changes relative to incorrect use of activegroupid 2016-08-05 15:19:42 +01:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
Diva Canto
49d19e3650 Moved DataSnapshot feature to OptionalModules too. 2015-09-04 15:17:53 -07:00