Melanie
e62d1cc480
Merge branch 'master' into careminster-presence-refactor
2011-05-20 22:38:05 +01:00
Melanie
fdbcd2fbf9
Add a missing virtual keyword
2011-05-20 23:27:16 +02:00
Melanie
8a46484a59
Make public interface methods in MySQLSimulation data virtual so the CM
...
data layer can inherit from it
2011-05-20 23:17:46 +02:00
Justin Clark-Casey (justincc)
9fc29e1595
Implement llGetLinKNumberOfSides().
...
Based on code in http://opensimulator.org/mantis/view.php?id=5489 Thanks onesong.
2011-05-20 20:19:32 +01:00
Justin Clark-Casey (justincc)
6e7b588235
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-20 20:06:51 +01:00
Kim King
a2c19847b4
ScriptEngine/Shared: Fix bug 5473 (v2).
2011-05-20 20:00:55 +01:00
Diva Canto
d21e9c755f
HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
2011-05-19 16:54:46 -07:00
BlueWall
584bce36ac
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-19 01:35:11 -04:00
BlueWall
926a100652
Add stub for llGetLinkNumberOfSides(integer link)
2011-05-19 01:34:11 -04:00
Justin Clark-Casey (justincc)
bdd7849094
Allow item links to be deleted even when other deletes and purges are disabled.
...
If these links are not deleted, then they will build up in the player's inventory until they can no longer log in.
Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being
accidentally moved. When a link is deleted, the target of the link is never touched.
This is a general solution that accounts for the use of links anywhere in the user's inventory.
2011-05-19 00:51:14 +01:00
Tom
74dd619575
If a response cannot be obtained (the script has no handler) return a more friendly 500 error instead of crashing out with a null reference and letting the connection hang
2011-05-17 19:12:37 -07:00
Tom
1f17960e67
Also fix the locking of url.requests and tidy the locks in general
2011-05-17 18:56:55 -07:00
Tom
3d49f5bf57
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-17 18:44:54 -07:00
Tom
e847d1d83f
Lock m_requestMap properly to prevent some nasty access errors and the resulting downward spiral
2011-05-17 18:44:07 -07:00
Justin Clark-Casey (justincc)
6dcc87b1ad
Accidentally committed too early
...
Revert "Allow item links to be deleted even when other deletes and purges are disabled."
This reverts commit 491279f99a
.
2011-05-18 00:23:35 +01:00
Justin Clark-Casey (justincc)
c562b9ef19
correct small mistake in "delete object name <name>" usage summary
2011-05-18 00:22:09 +01:00
Justin Clark-Casey (justincc)
491279f99a
Allow item links to be deleted even when other deletes and purges are disabled.
...
If these links are not deleted, then they will build up in the player's inventory until they can no longer log in.
Accidental deletion of links due to bugs or other causes is potentially inconvenient but on a par with items being
accidentally moved. When a link is deleted, the target of the link is never touched.
This is a general solution that accounts for the use of links anywhere in the user's inventory.
2011-05-17 22:31:16 +01:00
Melanie
f9203ca7e0
Add a message packing library to binary-pack AgentCircuitData for faster
...
teleporting
2011-05-17 22:38:45 +02:00
Justin Clark-Casey (justincc)
784f70f704
don't throw a null reference if an inventory link target doesn't exist when we're inspecting in order to send the required inventory folders
2011-05-17 02:25:05 +01:00
Justin Clark-Casey (justincc)
467d7060ca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-17 01:58:51 +01:00
Justin Clark-Casey (justincc)
4232b1a89b
convert tabs to spaces
2011-05-17 01:57:18 +01:00
Kim King
901448a8eb
Fixup documentation for AutoBackupModule.
2011-05-17 01:55:54 +01:00
Melanie
6bac16fd88
Fix up handling of the estate dialog to prevent duplication of ban list names.
...
Allow more than 61 names in ban list without crashing the viewer.
2011-05-15 14:55:36 +02:00
Diva Canto
a2f034c554
Changed yet more Warns to Debugs.
2011-05-14 13:36:55 -07:00
Diva Canto
be6feff331
Also changed a couple of messages in WebUtil from Wanr/Info to Debug.
2011-05-14 13:09:59 -07:00
Melanie
37a7b87862
Merge branch 'master' into careminster-presence-refactor
2011-05-14 21:09:52 +01:00
Diva Canto
082a9ecd31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-14 12:57:34 -07:00
Diva Canto
a3aa839d75
Stop spamming Nebadon's console when assets aren't found in the asset server.
2011-05-14 12:56:50 -07:00
Melanie
344815ab79
Globally throttle script channel 0 comms to 5/s with 10s burst to prevent lag
...
griefing attacks
2011-05-14 17:24:59 +02:00
Melanie
d773d89145
Plug a hole that allows selling a copy of no copy objects when using hacked god mode to fool the viewer into thinking it can set that sale type
2011-05-14 17:24:22 +02:00
Melanie
c4fad3d887
Fix up a linking issue
2011-05-14 09:13:31 +02:00
Justin Clark-Casey (justincc)
e3b8d42bbc
refactor: improve PrimLimitsModule to call ILandObject.GetSimulatorMaxPrimCount() rather than use copy/pasted code
2011-05-14 02:51:29 +01:00
Justin Clark-Casey (justincc)
340e3ccf16
refactor: remove thisObject argument from ILandObject.Get*MaxPrimCount() instance methods since it didn't make sense to use anything other than the instance themselves.
2011-05-14 02:42:47 +01:00
Justin Clark-Casey (justincc)
bef1ffa7db
simplify code in llGetParcelMaxPrims() to use existing code in LandObject rather than duping the algo
2011-05-14 02:34:46 +01:00
Justin Clark-Casey (justincc)
1d86079141
Correct llGetParcelMaxPrims() to use the same calculation as used elsewhere instead of the old 0.22 prims/meter squared fudge factor.
...
Thanks to tglion for this.
2011-05-14 01:26:04 +01:00
Justin Clark-Casey (justincc)
26ce1d27d0
Minor doc change to see if this provokes a good panda build
2011-05-14 01:07:06 +01:00
Oren Hurvitz
64d868fb64
When loading an OAR that doesn't have parcels, create a default parcel
2011-05-14 00:41:32 +01:00
SignpostMarv Martin
cb6cd3714e
The get_grid_info REST call now encodes XML Entities
2011-05-14 00:31:54 +01:00
Makopoppo
7a54638b57
Swapped the two restart command descriptions each other
2011-05-14 00:25:31 +01:00
Justin Clark-Casey (justincc)
5573fcfa93
Fix adding/removing/replacing outfits in viewer 2
...
To get this to work, I had to disable the dupe link check I put in a couple of commits ago.
When the viewer adds wearables to an existing outfit, it first requests deletes of all the existing links before creating a new set.
Since these messages are async, the creates were being received before the deletes had a chance to complete, resulting in missing current outfit links.
However, the dupe check shouldn't be as important now that broken links have been fixed - it was the broken links that were causing the client to create dupes.
Tested on kokua 0.1.0 WIP and SL 2.6.3. I now have no problems managing outfits on my standalone.
2011-05-14 00:10:27 +01:00
Melanie
75d4956ee5
Merge branch 'master' into careminster-presence-refactor
2011-05-13 12:05:46 +01:00
Melanie
59d8588ae1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-05-13 12:03:16 +01:00
Melanie
eceedba23b
Fix the cert validation handler so that it will not block other parts of
...
the server doing ssl successfully.
2011-05-13 12:02:49 +01:00
Diva Canto
e39dec6f37
Hopefully this fixes offline messages. The problem was: the server is not setting the ContentLength of the response. That comes up to OpenSim as ContentLength=-1, which made the existing test fail.
2011-05-12 20:48:24 -07:00
Diva Canto
1cc70df3b4
One more thing printed out. #OfflineIM
2011-05-12 20:20:08 -07:00
Diva Canto
84f2a779b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-12 19:57:15 -07:00
Diva Canto
301321c853
Instrument the heck out of offline messages. THIS IS VERY VERBOSE.
2011-05-12 19:56:59 -07:00
Justin Clark-Casey (justincc)
5f9edd195c
Fix broken inventory links on viewer 2.
...
It appears that if the viewer requests a folder containing links, we must also send the folders that contain the link targets first.
This was tested with Kokua 0.1.0 WIP though I predict it will also work with other viewer 2s
2011-05-13 03:24:19 +01:00
Diva Canto
691283c44e
One more debug message for offline IMs.
2011-05-12 19:10:44 -07:00
Diva Canto
9e310a0c0f
Sequencing the using and try clauses as they were before, but this shows that that obsolete function is not catching 404's as it should...
2011-05-12 18:53:22 -07:00