ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-04 18:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,760 Commits 5 Branches 95 Tags
87f30709a246f72fd8a511ed9a76a17aac072ce2
Commit Graph

86 Commits

Author SHA1 Message Date
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
Melanie
fc33d569cd Merge branch 'master' into careminster-presence-refactor 2010-10-21 07:33:01 +01:00
Jonathan Freedman
19119d7705 * additional serveruri cleanup 2010-10-20 22:21:41 -04:00
Melanie
c2971a6398 Add group invites to the list of messages that get offlined 2010-10-10 20:15:02 +02:00
Jonathan Freedman
69acf9c79b * additional serveruri cleanup 2010-10-03 18:03:53 -04:00
Melanie
296cf04ce6 Merge branch 'master' into careminster-presence-refactor 2010-09-27 01:32:06 +01:00
Melanie
84ab4742c8 Quash the region ID on intersim messages. That prevents people from determining 
another avatars location
 2010-09-27 01:31:17 +01:00
Melanie
9f17ae580d Merge branch 'master' into careminster-presence-refactor 2010-09-26 23:57:06 +01:00
Melanie
6f78358b09 When receiving intersim IM, don't let the spoof protection bomb 2010-09-26 23:50:55 +01:00
Melanie
0080f28f1d Merge branch 'master' into careminster-presence-refactor 2010-09-25 06:57:53 +01:00
Melanie
d8ae287ebf Prevent spoofing the agent name on text IM 2010-09-25 06:56:08 +01:00
root
7762301cea Revert "* Changed 11 calls for session info to the more optimized API method" 
This reverts commit 5dc9ea2f24.
Also makes online indicators and IM more robust
 2010-09-17 01:57:26 +01:00
root
251f2444d0 Revert "* Changed 11 calls for session info to the more optimized API method" 
This reverts commit 5dc9ea2f24.
Also makes online indicators and IM more robust
 2010-09-17 01:50:48 +02: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
John Hurliman
5dc9ea2f24 * Changed 11 calls for session info to the more optimized API method 2010-09-08 15:08:49 -07:00
Melanie
1bfec00a88 Merge branch 'master' into careminster-presence-refactor 2010-08-23 23:55:15 +01:00
Justin Clark-Casey (justincc)
74e5fe5aa9 Remove various warnings and improve logging messages. No functional changes. 2010-08-23 22:24:23 +01:00
sacha
047a4764f2 and another one... 2010-08-07 13:19:53 +00:00
sacha
e69efdd4ce Clean the loo after use please !!!!! 
No need to keep useless debug message !
Never heard of wasted cpucycle you darn kid !
 2010-08-07 13:13:27 +00:00
Melanie Thielker
bda83715e4 Clean up some messiness in IM sending. Having offline IM enabled now no longer 
suppresses "Inventory Saved" messages.
 2010-08-04 02:46:30 +01:00
Melanie Thielker
5ff9db7388 Clean up some messiness in IM sending. Having offline IM enabled now no longer 
suppresses "Inventory Saved" messages.
 2010-08-04 02:51:41 +02:00
Melanie Thielker
edcfaf60c9 Fix IMs the right way. This sets it up so that timestamps are actually 
in PST (to match viewer time), does correct storage and retrieval of
IMs, corrects the session ID and makes sure IMs don't get marked "saved"
if they're live. Removes the group IM save option, which our group IM
module never had in the first place, as saving group chatter makes no
sense at all.
 2010-07-03 20:27:00 +02:00
Melanie Thielker
3e908023b2 Force IM timestamps to current server time to prevent "Saved on" headers 
while the sender is online
 2010-06-28 08:58:51 +02:00
Melanie Thielker
cbca58401a Add the object owner UUID into the binary bucket of object to user IM 2010-06-24 20:46:24 +02:00
Melanie Thielker
2cc1f14b0c Replace the imSessionID, which is useless out of context, with the scope id 
in saved IMs
 2010-06-24 19:37:02 +02:00
Melanie Thielker
b012e963d7 New viewers don't set the "save offline IM" flag anymore. Set it serverside 
so messages get saved
 2010-06-24 18:48:40 +02:00
Diva Canto
d184fef4dc Inventory offers and subsequent notifications of acceptance/decline now working across the board. 2010-06-11 12:47:47 -07:00
Melanie
1cfebca48d Merge branch 'master' into careminster-presence-refactor 2010-06-11 20:35:00 +01:00
Melanie
4e0d62547d Merge branch 'master' into careminster-presence-refactor 2010-05-09 17:04:23 +01:00
Diva Canto
d72769930a More cleaning on presence. Friends online/offline works again. 2010-05-08 07:44:07 -07:00
Melanie
d3f33acc1a Merge branch 'master' into careminster-presence-refactor 2010-03-15 17:23:35 +00:00
Jeff Ames
f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
Melanie
028a87fe37 Merge branch 'master' into careminster-presence-refactor 
This brings careminster on the level of master. To be tested
 2010-03-03 02:07:03 +00:00
Diva Canto
3906a14857 Friends online notifications upon friendship now working (same sim only). 2010-02-27 10:24:55 -08:00
Melanie
a4472ceeac Implement the requestonlinenotification method 2010-02-27 15:50:41 +00:00
Melanie
0ab65899e4 Move requestonlinenotification generic message to presence module 2010-02-27 15:37:00 +00:00
Melanie
baaf660511 Merge branch 'master' into presence-refactor 
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
 2010-02-08 15:53:38 +00:00
Melanie
a87a247f05 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:21:06 +00:00
Melanie
cfca9e1e81 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:20:13 +00:00
Melanie
e9c9a74e0a Some merge fixups 2010-01-26 15:12:41 +00:00
Melanie
b80ea00265 Merge branch 'master' into careminster 2010-01-26 14:53:14 +00:00
Revolution
ec3c31e61e Updates all IRegionModules to the new style region modules. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-23 15:18:52 +00:00
Melanie
10f8c2ea9b Merge branch 'master' into presence-refactor 
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
 2010-01-16 00:05:08 +00:00
Melanie
d22bdb5095 Merge branch 'master' into careminster 2010-01-09 12:02:48 +00:00
Diva Canto
f11a97f12d * Finished SimulationServiceConnector 
* Started rerouting calls to UserService.
* Compiles. May run.
 2010-01-07 15:53:55 -08:00
dahlia
1e899704c1 Adds config option "ForwardOfflineGroupMessages" to allow disabling of group messages forwarded while offline. Addresses Mantis #4457 2010-01-07 11:28:38 -08:00
Melanie
3a953dfc98 This is somewhat major-like..... Change the intialization order of 
Application plugins so that MainServer.Instance gets assigned before
RegionModulesController loads the new style shared modules. This
is needed because otherwise no new style shared module could
register a HTTP method.... if it breaks, you get to keep both pieces
 2009-12-28 01:56:30 +00:00
Melanie
eebddcd5e6 Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListModule, OfflineMessageModule, PresenceModule, InventoryTransferModule and LureModule to new style. Reduce FriendsModule and PresenceModule to shells. 2009-12-28 01:24:15 +00:00