ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-05 02:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,336 Commits 5 Branches 96 Tags
cbb3a8ab94f8df6963f8045a3ca3795bcbcfe0b5
Commit Graph

1303 Commits

Author SHA1 Message Date
Melanie Thielker
af13c80d68 Remove getting the object capacity from the money module. It is now set 
directly from the Region Info (and the region ini file)
 2010-07-14 03:59:26 +02:00
Melanie
eacf3d9221 Merge branch 'master' into careminster-presence-refactor 2010-07-13 20:46:21 +01:00
Melanie
dd14016885 Revamp the permissions propagation. This MAY mess up. Please test. 
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
 2010-07-13 20:45:16 +01:00
Melanie Thielker
bed36901d1 Add CreateSelected flag onto objects rezzed from inventory 2010-07-13 20:37:12 +01:00
Melanie Thielker
89c1c5c35a Revamp the permissions propagation. This MAY mess up. Please test. 
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
 2010-07-13 20:40:23 +02:00
Melanie Thielker
31cbd6d113 Add CreateSelected flag onto objects rezzed from inventory 2010-07-13 18:23:23 +02:00
Justin Clark-Casey (justincc)
86f3f83250 uncomment a load iar code line I accidentally commented in the last commit 
hooray for automated tests
 2010-07-12 23:37:08 +01:00
Justin Clark-Casey (justincc)
3156f4bbeb comment out a lot of the debug log messages when loading an iar 
these are very redundant now and cause issues when loading large iars
diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
 2010-07-12 23:00:01 +01:00
Melanie Thielker
1169bfeaf3 Make taken items go back to the folder they came from 2010-07-10 10:43:34 +01:00
Melanie Thielker
8aa5f30082 Make taken items go back to the folder they came from 2010-07-10 10:51:49 +02:00
Melanie
5f400a50be Merge branch 'master' into careminster-presence-refactor 2010-07-08 17:32:57 +01:00
Diva Canto
debc780654 Fixes additional bug reported in mantis #4841. 2010-07-05 07:14:32 -07:00
Diva Canto
b84f72df0b Got rid of all hyperassets references. Also fixed accessing textures in user's inventory in foreign grids. 2010-07-04 14:59:15 -07:00
Diva Canto
02a15bc787 Started to clean up the mess with HyperAssets in LLClientView. Fixed HG access to Notecards in user's inventory. 2010-07-04 13:56:03 -07:00
Melanie
8a45191aa9 Merge branch 'master' into careminster-presence-refactor 2010-07-04 11:02:21 +01: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
86a82e6ecb Now, fix the slash issue the right way. Our URLs now work like SL's 2010-07-03 08:33:08 +02:00
Melanie Thielker
721d8a7298 Re-add the slashes at the end of the URL. Too much depends on them 2010-07-03 07:09:27 +02:00
Diva Canto
79c1eb1e39 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-02 06:36:08 -07:00
Diva Canto
490f1c144c Fixes mantis #4782 2010-07-02 06:35:38 -07:00
Melanie Thielker
e15f6905a5 Clean up IMoneyModule and adjust the other modules to the changes 2010-07-02 06:13:58 +01:00
Melanie Thielker
c87e6a289c Clean up IMoneyModule and adjust the other modules to the changes 2010-07-02 06:20:36 +02:00
Melanie
ec73074aac Merge branch 'master' into careminster-presence-refactor 2010-07-02 03:02:53 +01:00
Melanie Thielker
3d5d44279b ANother stab at LSL compatibility 2010-07-01 17:06:29 +02:00
Melanie Thielker
d5cbe4cb75 Remove trailing slash from HTTP URLs to be compatible with SL 2010-07-01 16:40:26 +02:00
Justin Clark-Casey (justincc)
8326f36cda minor: comment out high volume texture serving module debug message 2010-06-30 22:07:28 +01:00
Melanie
46a531d865 Merge branch 'master' into careminster-presence-refactor 2010-06-30 21:35:05 +01:00
Justin Clark-Casey (justincc)
eb30b60e52 minor: comment out high volume texture serving module debug message 2010-06-30 19:54:35 +01:00
Diva Canto
d06b977ed1 Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure. 2010-06-29 14:21:48 -07:00
Justin Clark-Casey (justincc)
c607e6f3b8 Revert "don't report the null uuid as a missing asset on saving oars/iars" 
This reverts commit 5ce119174e.

This change led to infinite timeout since the expected number of assets no longer matched requests.
Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient
 2010-06-29 20:30:22 +01:00
Diva Canto
08e3389790 Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase". 2010-06-29 04:38:15 -07:00
Diva Canto
9fde9085a0 Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken comments in InventoryAccessModule. 2010-06-29 02:07:10 -07:00
Diva Canto
d123350164 One more bug fix in FriendsModule: GrantRights. One of the caches was not being updated. 2010-06-28 16:04:12 -07: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
0a82d10fc4 Change the way IRegionModule us referenced by IEmailModule to 
allow later conversion to new style
 2010-06-28 03:14:05 +01:00
Melanie Thielker
4fa1d4896c Change the way IRegionModule us referenced by IEmailModule to 
allow later conversion to new style
 2010-06-28 02:30:36 +02:00
Melanie
ba38c697e8 Merge branch 'master' into careminster-presence-refactor 2010-06-27 20:05:55 +01:00
Tom Grimshaw
ef0ac7c403 Deal with incoming land objects properly so they don't just stack up 2010-06-26 23:20:28 -07:00
Tom Grimshaw
592ff1288d Add a new global event : OnTerrainUpdate 2010-06-26 18:51:19 -07:00
Tom Grimshaw
c97e9f8621 Reverting the ITerrainModule changes. Turns out this was useless. 2010-06-26 18:43:01 -07:00
Tom Grimshaw
3bcee57e3e add HasChanged to ITerrainModule 2010-06-26 17:34:19 -07:00
Tom Grimshaw
c3e806a2ea Add a new accessor for the TerainModule : "HasChanged" 2010-06-26 17:25:45 -07:00
Justin Clark-Casey (justincc)
a4a808818f don't report the null uuid as a missing asset on saving oars/iars 2010-06-25 21:48:19 +01:00
Melanie Thielker
8a0ec60c8f Unhook the dwell request from the land module (and therefore local storage) 2010-06-25 01:41:00 +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
Melanie Thielker
6c37a02c0f bug fix. 0,0 is a vlid sim coordinate 2010-06-24 06:02:44 +02:00
Melanie Thielker
854a8b9172 Security fix: Allow only textures to be fetched using HTTP texture cap 2010-06-22 23:39:25 +01:00
Melanie Thielker
5c02fb435d Security fix: Allow only textures to be fetched using HTTP texture cap 2010-06-22 17:35:00 +02:00