Commit Graph

1057 Commits

Author SHA1 Message Date
Melanie
69b5ddceda Unify a previous refactor of object return with the older solution. We
really don't need two methods doing the same thing, but differently.
2010-03-18 18:58:56 +00:00
Melanie
d3f33acc1a Merge branch 'master' into careminster-presence-refactor 2010-03-15 17:23:35 +00:00
Justin Clark-Casey (justincc)
315fa06c75 refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule 2010-03-12 23:20:38 +00:00
Justin Clark-Casey (justincc)
582375509c refactor: move RezSingleAttachmentFromInventory() from SceneGraph to AttachmentsModule 2010-03-12 22:48:49 +00:00
Justin Clark-Casey (justincc)
b9f5cd75bc refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule 2010-03-12 22:39:15 +00:00
Justin Clark-Casey (justincc)
19b4770fe7 start laoding griduser local connector, though it isn't invoked by anything yet 2010-03-12 22:18:48 +00:00
Justin Clark-Casey (justincc)
f2de50bb14 Fix tests broken in 88771aeed3
Adds MockUserAccountService and connects it up
Stops services being carried over between tests since this leads to hard to find bugs
Improves information and error reporting when loading plugins
2010-03-12 19:31:14 +00:00
Melanie
04a6b1caf8 Reintroduce a check that was dropped from permissions 2010-03-10 05:31:34 +00:00
Jeff Ames
f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
Diva Canto
c5bb51b443 Changed a cryptic debug message and a wrong comment 2010-03-09 17:33:31 -08:00
Diva Canto
dbb2edf1a6 Fixed caching of user accounts. 2010-03-09 17:09:44 -08:00
Melanie
689514a40a Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
to use that stored value.
2010-03-09 23:12:10 +00:00
Melanie
88771aeed3 Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
to use that stored value.
2010-03-09 23:11:28 +00:00
Melanie
40873504dc Merge branch 'master' into careminster-presence-refactor 2010-03-09 22:46:17 +00:00
Melanie
c7590bfd50 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-09 22:44:14 +00:00
unknown
98f91a252c - parcel blocking, region crossing blocking, teleport blocking
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 22:43:55 +00:00
unknown
fce9e499e4 - parcel blocking, region crossing blocking, teleport blocking 2010-03-09 22:38:58 +00:00
Melanie
80b5a95bb8 Revert "Adds Land Banning."
This reverts commit a87d7a1296.
2010-03-09 22:29:02 +00:00
Melanie
06e351f1ef Revert "Adds land ejection and freezing. Adds more checks to land banning."
This reverts commit 44d523518a.
2010-03-09 22:28:52 +00:00
John Hurliman
4b8af2e1aa Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-09 12:19:11 -08:00
John Hurliman
01218093a6 * Typo fixes
* Performance improvement in the expensive GenerateClientFlags()
2010-03-09 12:06:53 -08:00
Melanie
2362da2ad0 Add config option for switching between CSJ2K and BuggyJPEG. 2010-03-08 20:29:26 +00:00
John Hurliman
fa38cf3ee8 * Added code to support either CSJ2K or OpenJPEG texture decoding. Currently hardcoded to CSJ2K (so no functional change) but this could easily be switched to a config option 2010-03-07 17:03:56 -08:00
Melanie
2e5f7ec926 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-06 20:05:33 +00:00
unknown
2dcf73dd93 - supporting llTextBox
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 20:05:11 +00:00
Diva Canto
f4c165afe7 Bug fix: store correct position information upon logout. Fixes mantis #4608 2010-03-06 08:21:54 -08:00
Melanie
8180c72cbc Merge branch 'master' into careminster-presence-refactor 2010-03-06 12:37:24 +00:00
Diva Canto
5171464ac1 Justin, I must have been dyslexic when I wrote UserGridService as the name for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere. 2010-03-05 21:36:45 -08:00
Justin Clark-Casey (justincc)
395f343498 refactor: Move DetachSingleAttachmentToInv to region module
need to rationalize method names later
2010-03-06 00:07:47 +00:00
Justin Clark-Casey (justincc)
71797af540 refactor: move another AttachObject method 2010-03-05 23:35:49 +00:00
Justin Clark-Casey (justincc)
b72c2dc6e8 refactor: move user inventory side of RezSingleAttachment to module 2010-03-05 23:29:24 +00:00
Justin Clark-Casey (justincc)
60553e62a3 refactor: begin to move attachments code into a region module 2010-03-05 23:18:47 +00:00
Justin Clark-Casey (justincc)
e906dd3d28 add initial UserGrid service classes as per diva's direction
this will initially store home location data instead of the presence service
compiles but not enough to actually test yet
2010-03-05 22:29:51 +00:00
Justin Clark-Casey (justincc)
e39fc95659 Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
Melanie
107a0a4905 Merge branch 'master' into careminster-presence-refactor 2010-03-04 11:02:01 +00:00
Justin Clark-Casey (justincc)
edb176447b Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
2010-03-03 22:14:06 +00: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
00e6739b7d Offline friendship offers now working. 2010-03-01 22:21:33 -08:00
Diva Canto
c6a5ff26ff Friends rights under control. 2010-03-01 21:32:55 -08:00
Diva Canto
cfaf087b89 More work on GrantRights. Still not right. 2010-03-01 09:23:33 -08:00
Melanie
b8d89ac6da Fix -1 checks for login case 2010-03-01 02:57:25 +00:00
Melanie
dc22e74033 Small tweak 2010-03-01 02:54:18 +00:00
Melanie
38ea1dd5c8 Merge branch 'master' into presence-refactor 2010-03-01 01:01:32 +00:00
Melanie
65fadd2f67 Should have things the right way around, better that way 2010-03-01 00:20:34 +00:00
Melanie
bfcc57c071 Change friends to handle offers as it was originally designed. This may
need to be changed in SQLite & MSSQL as well
2010-03-01 00:02:14 +00:00
Melanie
adb9cc2af9 Implement rights changes locall (UNTESTED) 2010-02-28 23:26:13 +00:00
Diva Canto
5c5966545d Initial Online friends notification seems to be working reliably now. All this needs more testing, but everything is there. 2010-02-28 12:07:38 -08:00
Diva Canto
db24e57cab Friends connectors finished. Status notification working across the board. One last bug: friends online upon login are not being sent to the user. 2010-02-28 08:36:13 -08:00
Diva Canto
1daabc3473 Status notification (online/offline) working for same sim. 2010-02-27 18:16:31 -08:00
Diva Canto
593fd54fc7 Update the local cache upon friendship acceptance. Logout notifications working. 2010-02-27 11:23:31 -08:00