ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-03 00:46:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,166 Commits 5 Branches 94 Tags
303c02133fe2bb7ff4fe499dc855bb358ca4fcb6
Commit Graph

265 Commits

Author SHA1 Message Date
Melanie
7fef89847c Merge branch 'master' into careminster-presence-refactor 2010-12-09 02:24:12 +00:00
Melanie
4df1d25d23 Plumb a code path for the entity transfer module to ask a destination scene 
whether or not an agent is allowed there as a root agent.
 2010-12-09 01:55:32 +00:00
Melanie
f28dc77ab4 Plumb a code path for the entity transfer module to ask a destination scene 
whether or not an agent is allowed there as a root agent.
 2010-12-09 02:01:41 +01:00
Diva Canto
796216e44f Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs) 2010-12-07 20:05:53 -08:00
Melanie
45314c6622 Merge branch 'master' into careminster-presence-refactor 2010-12-06 02:54:51 +00:00
Jonathan Freedman
45cd2e3ef9 Merge branch 'master-core' into mantis5110 2010-12-05 11:49:15 -08:00
Melanie
342dc532ec Merge branch 'master' into careminster-presence-refactor 
Also prevent god takes from ending up in Lost and Found
 2010-12-03 02:36:13 +00:00
Diva Canto
ae4b02e115 WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. 2010-11-25 11:14:16 -08:00
Jonathan Freedman
bc51dfc45e Merge branch 'master-core' into mantis5110 2010-11-23 22:27:54 -08:00
Melanie
45b08a9ce3 Fix more potential nullrefs 2010-11-23 14:02:20 +00:00
Melanie
4a54b3318b Fix more potential nullrefs 2010-11-23 00:31:09 +01:00
Jonathan Freedman
b7f5e82843 Merge branch 'master-core' into mantis5110 2010-11-21 20:01:48 -08:00
Diva Canto
0fec29c849 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-21 17:19:45 -08:00
Diva Canto
c617d658dd Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. 
New migration in inventory table in order to make CreatorID varchar(255).
 2010-11-21 17:19:24 -08:00
Melanie
22ff06ba17 Merge branch 'master' into careminster-presence-refactor 2010-11-22 01:09:26 +00:00
Melanie
8d7b181b58 Merge branch 'master' into careminster-presence-refactor 2010-11-21 23:47:28 +00:00
Melanie
2b0ef9ad1d Implement a method to allow regions to query the gridwide Freeswitch 
configuration from ROBUST
 2010-11-21 22:17:25 +00:00
Melanie
c0ccfeebe7 Start implementing Freeswitch in ROBUST 2010-11-21 21:29:11 +00:00
Melanie
1cf8eb8a90 Start implementing Freeswitch in ROBUST 2010-11-21 20:59:01 +00:00
Melanie
7bb005b0d1 Change the way attachments are persisted. Editing a worn attachment will now 
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
 2010-11-16 21:01:56 +00:00
Melanie
4f15b8d4e6 Change the way attachments are persisted. Editing a worn attachment will now 
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
 2010-11-16 20:44:39 +01:00
Melanie
7f74dc1b14 Merge branch 'master' into careminster-presence-refactor 2010-10-23 00:21:42 +01:00
Justin Clark-Casey (justincc)
fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'" 
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
 2010-10-22 23:52:07 +01:00
Jonathan Freedman
d4144bedb8 * change the data exchanged within hypergrid transactions 2010-10-21 23:22:15 -04:00
Melanie
fc33d569cd Merge branch 'master' into careminster-presence-refactor 2010-10-21 07:33:01 +01:00
Jonathan Freedman
58f75fa19d * more url / hg cleanup 2010-10-20 22:21:45 -04:00
Jonathan Freedman
a2167b0f0d * more url / hg cleanup 2010-10-11 16:53:00 -04:00
Melanie
d8149373c1 Merge branch 'master' into careminster-presence-refactor 2010-10-06 00:27:10 +01:00
Jeff Ames
bc9f793a92 Formatting cleanup. 2010-10-04 21:28:17 -04:00
Melanie
da6816c805 Merge branch 'master' into careminster-presence-refactor 2010-10-04 04:49:54 +01:00
Diva Canto
37231e0941 Made the home agent handler check for xff if behind a proxy. 2010-10-03 21:21:02 -07:00
Diva Canto
934ae03d44 Made the Gatekeeper proxy-able. 2010-10-03 20:35:26 -07:00
Diva Canto
0772e19af2 Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there. 2010-10-03 20:01:59 -07:00
Melanie
fd56fd2ce8 Merge branch 'master' into careminster-presence-refactor 2010-10-02 19:51:43 +01:00
BlueWall
ffc1123ca5 adding -logconfig to Robust.exe 
Adding -logconfig to Robust.exe. will still process the
	-logfile option, as before. No options given, the value
	"Robust.log" will be written in the ./bin directory
 2010-10-01 05:42:18 +01:00
Melanie
521e2c8355 Merge branch 'master' into careminster-presence-refactor 2010-09-30 16:01:45 +01:00
John Hurliman
b6e0563ad7 Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior 2010-09-29 14:34:02 -07:00
John Hurliman
9b7c99f0cf Made IGridUserService.SetLastPosition() more flexible to allow different possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now 2010-09-29 14:24:32 -07:00
Melanie
6a1ce17cdb Merge branch 'master' into careminster-presence-refactor 
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
 2010-09-13 16:17:38 +01:00
Jeff Ames
f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
Diva Canto
d301f3fd6a Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule. 2010-09-08 14:12:01 -07:00
Diva Canto
3fb4a17f10 No need for a config var for the HELO message on the server-side. It's robust. 2010-09-08 11:30:38 -07:00
Diva Canto
904d6b787a First version of the Hypergrid HELO service that will enable different backends to interoperate. 2010-09-08 09:53:57 -07:00
Melanie
e4c2b44e5c Merge branch 'master' into careminster-presence-refactor 2010-09-05 15:06:00 +01:00
Diva Canto
9fd9836841 Make User Agent Service and Login Service separable. 2010-09-04 16:39:03 -07:00
Diva Canto
8fc68c6d98 Added XFF header processing. Untested, for lack of proxy. 2010-09-03 17:18:53 -07:00
Melanie
f8ff98577e Merge branch 'master' into careminster-presence-refactor 2010-08-21 00:32:26 +01:00
Diva Canto
1955b79759 Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer. 2010-08-19 18:55:30 -07:00
Melanie
e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
Justin Clark-Casey (justincc)
576faee203 minor: change some logging levels 2010-08-11 23:17:29 +01:00